diff --git a/.github/workflows/dev-ci-cd.yml b/.github/workflows/dev-ci-cd.yml
index d5026bf..ae4a5f5 100644
--- a/.github/workflows/dev-ci-cd.yml
+++ b/.github/workflows/dev-ci-cd.yml
@@ -5,11 +5,9 @@ on:
     branches:
       - main
 
-name: Dev deployment
-
 jobs:
-  deploy:
-    name: Build image and push to Amazon ECR
+  deploy-dev:
+    name: Build image and push to Amazon ECR (Dev)
     runs-on: ubuntu-latest
     environment: dev
 
@@ -29,9 +27,61 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
         with:
           mask-password: "true"
+
       - name: Build image
         run: |
-          docker build --build-arg BACKEND_URL=$BACKEND_URL --build-arg AUTH_URL=$AUTH_URL --build-arg BUILD_FEATURE="" -t dena-attester:latest .
+          docker build --build-arg BACKEND_URL=$BACKEND_URL --build-arg AUTH_URL=$AUTH_URL --build-arg BUILD_FEATURE="" -t dena-attester-peregrine:latest .
         env:
           BACKEND_URL: ${{ vars.BACKEND_URL }}
           AUTH_URL: ${{ vars.AUTH_URL }}
+
+      - name: Tag, and push image to Amazon ECR
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          ECR_REPOSITORY: dena/attester_peregrine
+          IMAGE_TAG: ${{ github.sha }}
+        run: |
+          docker tag dena-attester-peregrine $ECR_REGISTRY/$ECR_REPOSITORY:latest
+          docker tag dena-attester-peregrine $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
+
+  deploy-prod:
+    name: Build image and push to Amazon ECR (Prod)
+    runs-on: ubuntu-latest
+    environment: production
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_PROD }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_PROD }}
+          aws-region: eu-central-1
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+        with:
+          mask-password: "true"
+
+      - name: Build image
+        run: |
+          docker build --build-arg BACKEND_URL=$BACKEND_URL --build-arg AUTH_URL=$AUTH_URL -t dena-attester-spiritnet:latest .
+        env:
+          BACKEND_URL: ${{ vars.BACKEND_URL }}
+          AUTH_URL: ${{ vars.AUTH_URL }}
+
+      - name: Tag, and push image to Amazon ECR
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          ECR_REPOSITORY: dena/attester-spiritnet
+          IMAGE_TAG: ${{ github.sha }}
+        run: |
+          docker tag dena-attester $ECR_REGISTRY/$ECR_REPOSITORY:latest
+          docker tag dena-attester $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest