diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile
index 861b4699ed0b..1f9da067f2cd 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM apache/ozone-runner
+ARG OZONE_RUNNER_VERSION
+
+FROM apache/ozone-runner:${OZONE_RUNNER_VERSION}
 
 # Install ssh
 RUN sudo yum install -y openssh-clients openssh-server
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
index 1718430662c8..8bb640957edb 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml
@@ -17,7 +17,11 @@
 version: "3"
 services:
    datanode:
-      build: .
+      build:
+         context: .
+         args:
+            - OZONE_RUNNER_VERSION
+      image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
         - ../..:/opt/hadoop
@@ -27,7 +31,11 @@ services:
       env_file:
         - ./docker-config
    om1:
-      build: .
+      build:
+         context: .
+         args:
+            - OZONE_RUNNER_VERSION
+      image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
@@ -40,7 +48,11 @@ services:
           - ./docker-config
       command: sleep 1d
    om2:
-      build: .
+      build:
+         context: .
+         args:
+            - OZONE_RUNNER_VERSION
+      image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
@@ -53,7 +65,11 @@ services:
          - ./docker-config
       command: sleep 1d
    om3:
-      build: .
+      build:
+         context: .
+         args:
+            - OZONE_RUNNER_VERSION
+      image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
@@ -66,7 +82,11 @@ services:
          - ./docker-config
       command: sleep 1d
    scm:
-      build: .
+      build:
+         context: .
+         args:
+            - OZONE_RUNNER_VERSION
+      image: ozone-runner-om-ha:${OZONE_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile b/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile
index b07800053b2a..da2adab9f8de 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile
@@ -13,7 +13,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM apache/ozone-runner
+
+ARG OZONE_RUNNER_VERSION
+
+FROM apache/ozone-runner:${OZONE_RUNNER_VERSION}
+
 RUN sudo yum install -y openssh-clients openssh-server
 
 RUN sudo ssh-keygen -A
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/README.md b/hadoop-ozone/dist/src/main/compose/ozonescripts/README.md
index 2531fa43660f..e191825f6338 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/README.md
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/README.md
@@ -22,10 +22,10 @@ similar to a real cluster.
 To use it, first start the cluster:
 
 ```
-docker-copmose up -d
+docker-compose up -d
 ```
 
-After a successfull startup (which starts only the ssh daemons) you can start ozone:
+After a successful startup (which starts only the ssh daemons) you can start ozone:
 
 ```
 ./start.sh
@@ -35,4 +35,4 @@ Check it the java processes are started:
 
 ```
 ./ps.sh
-```
\ No newline at end of file
+```
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
index 62f116368f4b..e19dd235c8ff 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
@@ -17,7 +17,11 @@
 version: "3"
 services:
    datanode:
-      build: .
+      build:
+         context: .
+         args:
+            - OZONE_RUNNER_VERSION
+      image: ozone-runner-scripts:${OZONE_RUNNER_VERSION}
       volumes:
         - ../..:/opt/hadoop
       ports:
@@ -25,7 +29,11 @@ services:
       env_file:
         - ./docker-config
    om:
-      build: .
+      build:
+         context: .
+         args:
+            - OZONE_RUNNER_VERSION
+      image: ozone-runner-scripts:${OZONE_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -33,7 +41,11 @@ services:
       env_file:
           - ./docker-config
    scm:
-      build: .
+      build:
+         context: .
+         args:
+            - OZONE_RUNNER_VERSION
+      image: ozone-runner-scripts:${OZONE_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports: