diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5ddd99e..dc74019 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 34959f6..7c0b65c 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         distro: [foxy]
     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 72a6844..82c67c9 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       context: ..
       dockerfile: docker/Dockerfile
       args:
-        - TAG=foxy-master
+        - TAG=foxy-4.4
     environment:
       DISPLAY: $DISPLAY
       XAUTHORITY: $XAUTHORITY
@@ -14,7 +14,7 @@ services:
       ROS_LOCALHOST_ONLY: $ROS_LOCALHOST_ONLY
       ROS_DOMAIN_ID: $ROS_DOMAIN_ID
     container_name: snp_automate_2022
-    image: ghcr.io/ros-industrial-consortium/snp_automate_2022:foxy-master
+    image: ghcr.io/ros-industrial-consortium/snp_automate_2022:foxy-4.4
     stdin_open: true
     tty: true
     network_mode: host
@@ -63,4 +63,4 @@ services:
     # Share the network with the host PC
     network_mode: host
     ipc: host
-    pid: host
\ No newline at end of file
+    pid: host