diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
deleted file mode 100644
index d919a70..0000000
--- a/.github/workflows/docker-image.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2.1.0
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-    
-    - name: Build the Docker image
-      run: |
-        docker build tests/ --file tests/Dockerfile --tag ghcr.io/01-edu/test-blockchain:latest
-        # docker run ghcr.io/01-edu/test-blockchain:latest
-        docker push ghcr.io/01-edu/test-blockchain:latest
diff --git a/.github/workflows/ga-image-build-master.yml b/.github/workflows/ga-image-build-master.yml
new file mode 100644
index 0000000..2baae10
--- /dev/null
+++ b/.github/workflows/ga-image-build-master.yml
@@ -0,0 +1,33 @@
+name: 🐳 On Master - Build and Test Docker Image
+
+on:
+  push:
+    branches: ["master"]
+
+jobs:
+  build-image:
+    name: 🏗️ Build Image
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 🐧 Checkout
+        uses: actions/checkout@v3
+
+      - name: 📦 Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 🐳 Login to docker.01-edu.org Registry
+        uses: docker/login-action@v2
+        with:
+          registry: docker.01-edu.org
+          username: ${{ secrets.USER_DOCKER_01EDU_ORG }}
+          password: ${{ secrets.SECRET_DOCKER_01EDU_ORG }}
+    
+      - name: 🏗️ Build the Branch-Blockchain Docker image
+        run: |
+          docker build tests/ --file tests/Dockerfile --tag ghcr.io/01-edu/test-blockchain:latest
+          docker push ghcr.io/01-edu/test-blockchain:latest