diff --git a/.github/workflows/build-and-push-dev-images.yml b/.github/workflows/build-and-push-dev-images.yml
index 7612a3e19e..18a177f379 100644
--- a/.github/workflows/build-and-push-dev-images.yml
+++ b/.github/workflows/build-and-push-dev-images.yml
@@ -28,13 +28,13 @@ on:
         required: false
       lang:
         description: List of languages to build
-        default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy'
+        default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools'
         required: false
 
 # Default values for the builds triggered by the push event
 env:
   ol: 'oraclelinux7, oraclelinux8, oraclelinux9'
-  lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy'
+  lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools'
 
 jobs:
   prepare:
diff --git a/OracleLinuxDevelopers/oraclelinux8/helm/3.12/Dockerfile b/OracleLinuxDevelopers/oraclelinux8/helm/3.12/Dockerfile
new file mode 100644
index 0000000000..ce331c8ffb
--- /dev/null
+++ b/OracleLinuxDevelopers/oraclelinux8/helm/3.12/Dockerfile
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# OCNE 1.8 - Helm 3.12
+
+FROM ghcr.io/oracle/oraclelinux:8
+
+RUN dnf install -y oracle-olcne-release-el8 && \
+    dnf config-manager --enable ol8_olcne18 ol8_addons ol8_baseos_latest ol8_appstream && \
+    dnf install -y helm && \
+    rm -rf /var/cache/dnf
+
+ENTRYPOINT ["helm"]
+
+CMD ["--help"]
\ No newline at end of file
diff --git a/OracleLinuxDevelopers/oraclelinux8/kubectl/1.28/Dockerfile b/OracleLinuxDevelopers/oraclelinux8/kubectl/1.28/Dockerfile
new file mode 100644
index 0000000000..e584e5620b
--- /dev/null
+++ b/OracleLinuxDevelopers/oraclelinux8/kubectl/1.28/Dockerfile
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# OCNE 1.8 - Kubectl 1.28
+
+FROM ghcr.io/oracle/oraclelinux:8
+
+RUN dnf install -y oracle-olcne-release-el8 && \
+    dnf config-manager --enable ol8_olcne18 ol8_addons ol8_baseos_latest ol8_appstream && \
+    dnf install -y kubectl && \
+    rm -rf /var/cache/dnf
+
+ENTRYPOINT ["kubectl"]
+
+CMD ["--help"]
\ No newline at end of file
diff --git a/OracleLinuxDevelopers/oraclelinux8/ocne-tools/1.8/Dockerfile b/OracleLinuxDevelopers/oraclelinux8/ocne-tools/1.8/Dockerfile
new file mode 100644
index 0000000000..f660d51561
--- /dev/null
+++ b/OracleLinuxDevelopers/oraclelinux8/ocne-tools/1.8/Dockerfile
@@ -0,0 +1,21 @@
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# OCNE 1.8 - Helm 3.12
+
+# hadolint ignore=DL3007
+FROM ghcr.io/oracle/oci-cli:latest
+
+USER root
+
+RUN dnf install -y oracle-olcne-release-el8 && \
+    dnf config-manager --enable ol8_olcne18 ol8_addons ol8_baseos_latest ol8_appstream && \
+    dnf install -y helm kubectl && \
+    rm -rf /var/cache/dnf
+
+COPY help.sh /opt/help.sh
+
+USER oracle
+
+ENTRYPOINT []
+
+CMD ["/bin/bash", "/opt/help.sh"]
\ No newline at end of file
diff --git a/OracleLinuxDevelopers/oraclelinux8/ocne-tools/1.8/help.sh b/OracleLinuxDevelopers/oraclelinux8/ocne-tools/1.8/help.sh
new file mode 100755
index 0000000000..3356c0e418
--- /dev/null
+++ b/OracleLinuxDevelopers/oraclelinux8/ocne-tools/1.8/help.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+echo "OCNE/OKE Tools"
+
+echo "oci-cli version: $(oci --version)"
+helm version --template='helm version: {{.Version}}'
+echo ''
+echo "kubectl versions: "
+kubectl version --client
\ No newline at end of file
diff --git a/OracleLinuxDevelopers/oraclelinux9/helm/3.12/Dockerfile b/OracleLinuxDevelopers/oraclelinux9/helm/3.12/Dockerfile
new file mode 100644
index 0000000000..1a8d77d438
--- /dev/null
+++ b/OracleLinuxDevelopers/oraclelinux9/helm/3.12/Dockerfile
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# OCNE 1.8 - Helm 3.12
+
+FROM ghcr.io/oracle/oraclelinux:9
+
+RUN dnf install -y oracle-olcne-release-el9 && \
+    dnf config-manager --enable ol9_olcne18 ol9_addons ol9_baseos_latest ol9_appstream && \
+    dnf install -y helm && \
+    rm -rf /var/cache/dnf
+
+ENTRYPOINT ["helm"]
+
+CMD ["--help"]
\ No newline at end of file
diff --git a/OracleLinuxDevelopers/oraclelinux9/kubectl/1.28/Dockerfile b/OracleLinuxDevelopers/oraclelinux9/kubectl/1.28/Dockerfile
new file mode 100644
index 0000000000..9bc1f0954b
--- /dev/null
+++ b/OracleLinuxDevelopers/oraclelinux9/kubectl/1.28/Dockerfile
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+# OCNE 1.8 - Kubectl 1.28
+
+FROM ghcr.io/oracle/oraclelinux:9
+
+RUN dnf install -y oracle-olcne-release-el9 && \
+    dnf config-manager --enable ol9_olcne18 ol9_addons ol9_baseos_latest ol9_appstream && \
+    dnf install -y kubectl && \
+    rm -rf /var/cache/dnf
+
+ENTRYPOINT ["kubectl"]
+
+CMD ["--help"]
\ No newline at end of file