diff --git a/docker/docker-compose-batch-etl.yaml b/docker/docker-compose-batch-etl.yaml
index 8844878..532c49e 100644
--- a/docker/docker-compose-batch-etl.yaml
+++ b/docker/docker-compose-batch-etl.yaml
@@ -3,7 +3,7 @@ services:
   batch-etl:
     networks:
       ozone-analytics:
-    image: mekomsolutions/ozone-flink-jobs-batch
+    image: mekomsolutions/ozone-flink-jobs-batch:2.5.0
     depends_on:
       analytics-migration:
         condition: service_completed_successfully
diff --git a/docker/docker-compose-export.yaml b/docker/docker-compose-export.yaml
index 9efe1fe..741c894 100644
--- a/docker/docker-compose-export.yaml
+++ b/docker/docker-compose-export.yaml
@@ -3,7 +3,7 @@ services:
   parquet-export:
     networks:
       ozone-analytics:
-    image: mekomsolutions/ozone-flink-parquet-export
+    image: mekomsolutions/ozone-flink-parquet-export:2.5.0
     environment:
       - ANALYTICS_DB_USER=${ANALYTICS_DB_USER}
       - ANALYTICS_DB_PASSWORD=${ANALYTICS_DB_PASSWORD}
diff --git a/docker/docker-compose-streaming-common.yaml b/docker/docker-compose-streaming-common.yaml
index 4968ddc..d2998c2 100644
--- a/docker/docker-compose-streaming-common.yaml
+++ b/docker/docker-compose-streaming-common.yaml
@@ -116,7 +116,7 @@ services:
     networks:
       ozone-analytics:
     restart: unless-stopped
-    image: mekomsolutions/ozone-flink-jobs
+    image: mekomsolutions/ozone-flink-jobs:2.5.0
     ports:
       - "8084:8081"
       - "9250:9250"
diff --git a/docker/drill/Dockerfile b/docker/drill/Dockerfile
index 80d81f0..9cada74 100644
--- a/docker/drill/Dockerfile
+++ b/docker/drill/Dockerfile
@@ -1,4 +1,4 @@
-FROM apache/drill
+FROM apache/drill:1.21.1
 
 USER root
 
diff --git a/docker/minio-webhook/Dockerfile b/docker/minio-webhook/Dockerfile
index d245dfd..b798ee0 100644
--- a/docker/minio-webhook/Dockerfile
+++ b/docker/minio-webhook/Dockerfile
@@ -1,6 +1,6 @@
 
   
-FROM node:latest
+FROM node:lts-alpine
 
 WORKDIR /usr/src/app
 COPY package*.json ./
diff --git a/docker/setup-connect/Dockerfile b/docker/setup-connect/Dockerfile
index 434012e..634f910 100644
--- a/docker/setup-connect/Dockerfile
+++ b/docker/setup-connect/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM alpine:3
 # Set non-built-time labels
 LABEL org.opencontainers.image.authors="Mekom Solutions"
 LABEL org.opencontainers.image.description="A custom image used to configure kafka connect for flink"
diff --git a/pom.xml b/pom.xml
index 8894b80..9ddebb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>com.ozonehis</groupId>
   <artifactId>ozone-analytics</artifactId>
   <name>Ozone Analytics</name>
-  <version>2.4.0-SNAPSHOT</version>
+  <version>2.4.0</version>
   <packaging>pom</packaging>
   <organization>
     <name>Ozone HIS</name>