diff --git a/.github/workflows/ci_workflow.yaml b/.github/workflows/ci_workflow.yaml
index 49b40ea7db..0158a71636 100644
--- a/.github/workflows/ci_workflow.yaml
+++ b/.github/workflows/ci_workflow.yaml
@@ -52,18 +52,19 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: hardhat/Dockerfile
+          push: true
+          tags: e1018mc/limechain:smart_contract
+
       - name: Run local devnet
         run: docker-compose up -d
 
       - name: Build a new image with Apollo contract
         run: docker build -t hardhat-ignition .
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: e1018mc/limechain:apollo_contract
-
       - name: Destroy local devnet
         run: docker-compose down
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7428900594..e247f9c4a5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,11 +5,20 @@ services:
     image: e1018mc/limechain:go-ethereum-app
     platform: linux/x86_64
     ports:
-      - "8545:8545"
+      - "8546:8546"
     environment:
       - ENV_VAR=Test
     networks:
       - devnet
+  app2:
+    image: e1018mc/limechain:smart_contract
+    platform: linux/x86_64
+    ports:
+      - "8545:8545"
+    environment:
+      - ENV_VAR=Test-contracts
+    networks:
+      - devnet
 
 networks:
   devnet: