diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c54c1d5..946cbd5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -55,8 +55,7 @@ jobs:
           context: .
           file: docker/Dockerfile
           build-args: |
-            TAG=${{ matrix.distro }}-master
-            ROS_DISTRO=${{ matrix.distro }}
+            TAG=${{ matrix.distro }}-4.4
           push: ${{ env.PUSH_DOCKER_IMAGE }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 664befd..bbbd0df 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         distro: [humble]
     container:
-      image: ghcr.io/ros-industrial-consortium/scan_n_plan_workshop:${{ matrix.distro }}-master
+      image: ghcr.io/ros-industrial-consortium/scan_n_plan_workshop:${{ matrix.distro }}-4.4
       env:
         CCACHE_DIR: ${{ github.workspace }}/${{ matrix.distro }}/.ccache
         DEBIAN_FRONTEND: noninteractive
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f869a22..5c28eb8 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       context: ..
       dockerfile: docker/Dockerfile
       args:
-        - TAG=humble-master
+        - TAG=humble-4.4
     environment:
       DISPLAY: $DISPLAY
       XAUTHORITY: $XAUTHORITY