diff --git a/arm-gic-main.yaml b/arm-gic-main.yaml
deleted file mode 100644
index 29341a2..0000000
--- a/arm-gic-main.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
-- job:
-    name: arm-gic-main
-    node: docker-amd64-tf-a-jammy
-    project-type: multijob
-    concurrent: true
-    disabled: false
-    description: Main CI job for the arm-gic crate
-    properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
-    triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'main'
-          project-compare-type: PLAIN
-          project-pattern: 'rust-spmc/arm-gic'
-        trigger-on:
-            - patchset-created-event:
-                exclude-drafts: true
-                exclude-trivial-rebase: false
-                exclude-no-code-change: true
-                exclude-private: true
-                exclude-wip: true
-            - comment-added-contains-event:
-                comment-contains-value: '^RUN_CI$'
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
-    parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'rust-spmc/arm-gic'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/main'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: ARM_GIC_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: TEST_FEATURES
-            description: 'Features the arm-gic crate will be tested against'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,arm-gic"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
-    wrappers:
-      - credentials-binding:
-          - ssh-user-private-key:
-              credential-id: TFA_CI_BOT_USER_SSH_KEY
-              key-file-variable: CI_BOT_KEY
-              username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
-      - workspace-cleanup
-      - timestamps
-    builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        ARM_GIC_GERRIT_PROJECT=${GERRIT_PROJECT}
-        ARM_GIC_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Platform independent tests
-        condition: COMPLETED
-        projects:
-        - name: generic-lib-testing
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_REPO_NAME=arm-gic
-            TEST_REPO_PROJECT=rust-spmc
-            TEST_FEATURES=${TEST_FEATURES}
-          property-file: tf-a-env.param
diff --git a/scripts/clone.sh b/scripts/clone.sh
index c839e3d..022b296 100755
--- a/scripts/clone.sh
+++ b/scripts/clone.sh
@@ -49,11 +49,10 @@
 ARM_FFA_GERRIT_PROJECT="${ARM_FFA_GERRIT_PROJECT:-rust-spmc/arm-ffa}"
 ARM_PL011_UART_GERRIT_PROJECT="${ARM_PL011_UART_GERRIT_PROJECT:-rust-spmc/arm-pl011-uart}"
 ARM_PSCI_GERRIT_PROJECT="${ARM_PSCI_GERRIT_PROJECT:-rust-spmc/arm-psci}"
-ARM_GIC_GERRIT_PROJECT="${ARM_GIC_GERRIT_PROJECT:-rust-spmc/arm-gic}"
-ARM_FVP_BASE_PAC_GERRIT_PROJECT="${ARM_GIC_GERRIT_PROJECT:-rust-spmc/arm-fvp-base-pac}"
-ARM_SP805_GERRIT_PROJECT="${ARM_GIC_GERRIT_PROJECT:-rust-spmc/arm-sp805}"
-ARM_XLAT_GERRIT_PROJECT="${ARM_GIC_GERRIT_PROJECT:-rust-spmc/arm-xlat}"
-ARM_FW_DEV_GUIDE_GERRIT_PROJECT="${ARM_GIC_GERRIT_PROJECT:-rust-spmc/firmware-development-guide}"
+ARM_FVP_BASE_PAC_GERRIT_PROJECT="${ARM_FVP_BASE_PAC_GERRIT_PROJECT:-rust-spmc/arm-fvp-base-pac}"
+ARM_SP805_GERRIT_PROJECT="${ARM_SP805_GERRIT_PROJECT:-rust-spmc/arm-sp805}"
+ARM_XLAT_GERRIT_PROJECT="${ARM_XLAT_GERRIT_PROJECT:-rust-spmc/arm-xlat}"
+ARM_FW_DEV_GUIDE_GERRIT_PROJECT="${ARM_FW_DEV_GUIDE_GERRIT_PROJECT:-rust-spmc/firmware-development-guide}"
 JOBS_PROJECT="${JOBS_PROJECT:-ci/tf-a-job-configs.git}"
 
 # Default Reference specs
@@ -67,7 +66,6 @@
 ARM_FFA_GERRIT_REFSPEC="${ARM_FFA_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
 ARM_PL011_UART_GERRIT_REFSPEC="${ARM_PL011_UART_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
 ARM_PSCI_GERRIT_REFSPEC="${ARM_PSCI_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
-ARM_GIC_GERRIT_REFSPEC="${ARM_GIC_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
 ARM_FVP_BASE_PAC_GERRIT_REFSPEC="${ARM_FVP_BASE_PAC_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
 ARM_SP805_GERRIT_REFSPEC="${ARM_SP805_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
 ARM_XLAT_GERRIT_REFSPEC="${ARM_XLAT_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
@@ -88,7 +86,6 @@
     "${GERRIT_HOST};${ARM_FFA_GERRIT_PROJECT};arm-ffa;${ARM_FFA_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${ARM_PL011_UART_GERRIT_PROJECT};arm-pl011-uart;${ARM_PL011_UART_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${ARM_PSCI_GERRIT_PROJECT};arm-psci;${ARM_PSCI_GERRIT_REFSPEC}"
-    "${GERRIT_HOST};${ARM_GIC_GERRIT_PROJECT};arm-gic;${ARM_GIC_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${ARM_FVP_BASE_PAC_GERRIT_PROJECT};arm-fvp-base-pac;${ARM_FVP_BASE_PAC_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${ARM_SP805_GERRIT_PROJECT};arm-sp805;${ARM_SP805_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${ARM_XLAT_GERRIT_PROJECT};arm-xlat;${ARM_XLAT_GERRIT_REFSPEC}"