diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
new file mode 100644
index 0000000..03a9444
--- /dev/null
+++ b/.github/workflows/docker_image.yml
@@ -0,0 +1,54 @@
+name: Build and Deploy Docker Image
+
+on:
+  push:
+    branches:
+      - main
+      - Add_Docker_Image_Action
+    tags:
+      - 'v*.*.*'
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Log in to GitHub Container Registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: .devcontainer/Dockerfile.codespace
+        push: false
+        tags: ghcr.io/ncar/music-box:build-temp
+
+    - name: Build and push Docker image (latest)
+      if: github.ref == 'refs/heads/main'
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: .devcontainer/Dockerfile.codespace
+        push: true
+        tags: ghcr.io/ncar/music-box:latest
+
+    - name: Build and push Docker image (tagged)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: .devcontainer/Dockerfile.codespace
+        push: true
+        tags: ghcr.io/ncar/music-box:${{ github.ref_name }}
\ No newline at end of file
diff --git a/.github/workflows/npm_build_test.yml b/.github/workflows/npm_build_test.yml
index 3554232..428ca51 100644
--- a/.github/workflows/npm_build_test.yml
+++ b/.github/workflows/npm_build_test.yml
@@ -37,7 +37,4 @@ jobs:
     - run: npm run build --if-present
     - run: npm test
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
-    - name: Build and push Docker images
-      uses: docker/build-push-action@v6.7.0
-            
\ No newline at end of file
+      uses: codecov/codecov-action@v1
\ No newline at end of file