diff --git a/.github/workflows/_24_docker.yml b/.github/workflows/_24_docker.yml
index 0b0d390b2c..c5078942f4 100644
--- a/.github/workflows/_24_docker.yml
+++ b/.github/workflows/_24_docker.yml
@@ -115,9 +115,10 @@ jobs:
             type=raw,value=${{ inputs.network }}
             type=ref,event=branch
             type=ref,event=tag,prefix=${{ inputs.network }}-
-              type=raw,value=${{ needs.get-version-from-branch-name.outputs.version }},prefix=${{ inputs.network }}-,enable=${{ needs.get-version-from-branch-name.outputs.version != '0.0.0' }}
-              type=ref,event=pr
-              type=raw,value=${{ github.sha }},prefix=iet-,enable=${{ matrix.target == 'chainflip-ingress-egress-tracker' && github.ref_name == 'main' }}
+            type=raw,value=${{ needs.get-version-from-branch-name.outputs.version }},prefix=${{ inputs.network }}-,enable=${{ needs.get-version-from-branch-name.outputs.version != '0.0.0' }}
+            type=raw,value=${{ needs.get-version-from-branch-name.outputs.version }},enable=${{ needs.get-version-from-branch-name.outputs.version != '0.0.0' }}
+            type=ref,event=pr
+            type=raw,value=${{ github.sha }},prefix=iet-,enable=${{ matrix.target == 'chainflip-ingress-egress-tracker' && github.ref_name == 'main' }}
 
       - name: Login to Github Container Registry 🔑
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
@@ -139,7 +140,6 @@ jobs:
           build-args: |
             BUILD_DATETIME=${{ needs.get-date-time.outputs.date }} ${{ needs.get-date-time.outputs.time }}
             VCS_REF=${{ github.sha }}
-            CHAINSPEC=${{ inputs.network }}
 
       - name: Save tags to tar 📦
         if: inputs.save_tags != ''
@@ -201,6 +201,7 @@ jobs:
             type=ref,event=branch
             type=ref,event=tag,prefix=${{ inputs.network }}-
             type=raw,value=${{ needs.get-version-from-branch-name.outputs.version }},prefix=${{ inputs.network }}-,enable=${{ needs.get-version-from-branch-name.outputs.version != '0.0.0' }}
+            type=raw,value=${{ needs.get-version-from-branch-name.outputs.version }},enable=${{ needs.get-version-from-branch-name.outputs.version != '0.0.0' }}
             type=ref,event=pr
 
       - name: Login to DockerHub 🔑
@@ -222,7 +223,6 @@ jobs:
           build-args: |
             BUILD_DATETIME=${{ needs.get-date-time.outputs.date }} ${{ needs.get-date-time.outputs.time }}
             VCS_REF=${{ github.sha }}
-            CHAINSPEC=${{ inputs.network }}
 
       - name: Save image 📦
         if: inputs.save_tags != ''
diff --git a/ci/docker/development/chainflip-node.Dockerfile b/ci/docker/development/chainflip-node.Dockerfile
index 89be810e23..ee55425baa 100644
--- a/ci/docker/development/chainflip-node.Dockerfile
+++ b/ci/docker/development/chainflip-node.Dockerfile
@@ -11,6 +11,10 @@ LABEL org.opencontainers.image.created="${BUILD_DATETIME}"
 LABEL org.opencontainers.image.environment="development"
 LABEL org.opencontainers.image.documentation="https://github.com/chainflip-io/chainflip-backend"
 
+COPY ./state-chain/node/chainspecs/sisyphos.chainspec.raw.json /etc/chainflip/sisyphos.chainspec.json
+COPY ./state-chain/node/chainspecs/perseverance.chainspec.raw.json /etc/chainflip/perseverance.chainspec.json
+COPY ./state-chain/node/chainspecs/berghain.chainspec.raw.json /etc/chainflip/berghain.chainspec.json
+
 COPY chainflip-node /usr/local/bin/chainflip-node
 
 WORKDIR /etc/chainflip
diff --git a/ci/docker/production/chainflip-node.Dockerfile b/ci/docker/production/chainflip-node.Dockerfile
index d9d328bf66..8684047e94 100644
--- a/ci/docker/production/chainflip-node.Dockerfile
+++ b/ci/docker/production/chainflip-node.Dockerfile
@@ -1,7 +1,6 @@
 FROM ubuntu:22.04
 ARG BUILD_DATETIME
 ARG VCS_REF
-ARG CHAINSPEC
 
 LABEL org.opencontainers.image.authors="dev@chainflip.io"
 LABEL org.opencontainers.image.vendor="Chainflip Labs GmbH"
@@ -13,7 +12,9 @@ LABEL org.opencontainers.image.environment="development"
 LABEL org.opencontainers.image.documentation="https://github.com/chainflip-io/chainflip-backend"
 
 COPY --chown=1000:1000 chainflip-node /usr/local/bin/chainflip-node
-COPY --chown=1000:1000 ./state-chain/node/chainspecs/${CHAINSPEC}.chainspec.raw.json /etc/chainflip/${CHAINSPEC}.chainspec.json
+COPY --chown=1000:1000 ./state-chain/node/chainspecs/sisyphos.chainspec.raw.json /etc/chainflip/sisyphos.chainspec.json
+COPY --chown=1000:1000 ./state-chain/node/chainspecs/perseverance.chainspec.raw.json /etc/chainflip/perseverance.chainspec.json
+COPY --chown=1000:1000 ./state-chain/node/chainspecs/berghain.chainspec.raw.json /etc/chainflip/berghain.chainspec.json
 
 WORKDIR /etc/chainflip