diff --git a/opentofu/modules/kubernetes/main.tf b/opentofu/modules/kubernetes/main.tf
index 9ce94440..cc9d95a4 100644
--- a/opentofu/modules/kubernetes/main.tf
+++ b/opentofu/modules/kubernetes/main.tf
@@ -91,18 +91,21 @@ resource "oci_containerengine_cluster" "default_cluster" {
 }
 
 resource "oci_containerengine_addon" "oraoper_addon" {
+  count                            = var.use_cluster_addons ? 1 : 0
   addon_name                       = "OracleDatabaseOperator"
   cluster_id                       = oci_containerengine_cluster.default_cluster.id
   remove_addon_resources_on_delete = true
 }
 
 resource "oci_containerengine_addon" "certmgr_addon" {
+  count                            = var.use_cluster_addons ? 1 : 0
   addon_name                       = "CertManager"
   cluster_id                       = oci_containerengine_cluster.default_cluster.id
   remove_addon_resources_on_delete = true
 }
 
 resource "oci_containerengine_addon" "ingress_addon" {
+  count                            = var.use_cluster_addons ? 1 : 0
   addon_name                       = "NativeIngressController"
   cluster_id                       = oci_containerengine_cluster.default_cluster.id
   remove_addon_resources_on_delete = true
diff --git a/opentofu/modules/kubernetes/variables.tf b/opentofu/modules/kubernetes/variables.tf
index efa03b18..49394f9f 100644
--- a/opentofu/modules/kubernetes/variables.tf
+++ b/opentofu/modules/kubernetes/variables.tf
@@ -130,6 +130,11 @@ variable "byo_ocir_url" {
   type = string
 }
 
+variable "use_cluster_addons" {
+  type    = bool
+  default = true
+}
+
 variable "optimizer_version" {
   type = string
 }
diff --git a/opentofu/modules/vm/templates/cloudinit-compute.tpl b/opentofu/modules/vm/templates/cloudinit-compute.tpl
index 36150fd9..301fdbf3 100644
--- a/opentofu/modules/vm/templates/cloudinit-compute.tpl
+++ b/opentofu/modules/vm/templates/cloudinit-compute.tpl
@@ -12,6 +12,7 @@ users:
 package_update: false
 packages:
   - python3.11
+  - sqlcl
 
 write_files:
   - path: /etc/systemd/system/ai-optimizer.service
diff --git a/src/Dockerfile b/src/Dockerfile
index 997355c9..35628c20 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -6,14 +6,15 @@
 # Build from the project root directory:
 #  podman build -f src/Dockerfile -t ai-optimizer-aio:latest .
 ##################################################
-FROM container-registry.oracle.com/os/oraclelinux:8-slim AS all_in_one_pyenv
+FROM container-registry.oracle.com/os/oraclelinux:8 AS all_in_one_pyenv
 ENV RUNUSER=oracleai \
     VIRTUAL_ENV=/opt/.venv
 
 RUN groupadd -g 10001 $RUNUSER && \
     useradd -u 10001 -g $RUNUSER -md /app $RUNUSER && \
-    microdnf --nodocs -y install python3.11 python3.11-pip && \
-    microdnf clean all && \
+    dnf config-manager --add-repo https://yum.oracle.com/repo/OracleLinux/OL8/oracle/software/\$basearch && \
+    dnf --nodocs -y install python3.11 python3.11-pip sqlcl java-21-openjdk-headless --nogpgcheck && \
+    dnf clean all && \
     python3.11 -m venv --symlinks --upgrade-deps $VIRTUAL_ENV
 
 COPY --chown=$RUNUSER:$RUNUSER src /opt/package/src
diff --git a/src/client/Dockerfile b/src/client/Dockerfile
index fbb4c161..716410d5 100644
--- a/src/client/Dockerfile
+++ b/src/client/Dockerfile
@@ -6,14 +6,14 @@
 # Build from the project root directory:
 #  podman build -f src/client/Dockerfile -t ai-optimizer-client:latest .
 #############################################################
-FROM container-registry.oracle.com/os/oraclelinux:8-slim AS optimizer_base
+FROM container-registry.oracle.com/os/oraclelinux:8 AS optimizer_base
 ENV RUNUSER=oracleai \
     VIRTUAL_ENV=/opt/.venv
 
 RUN groupadd -g 10001 $RUNUSER && \
     useradd -u 10001 -g $RUNUSER -md /app $RUNUSER && \
-    microdnf --nodocs -y install python3.11 python3.11-pip && \
-    microdnf clean all && \
+    dnf --nodocs -y install python3.11 python3.11-pip && \
+    dnf clean all && \
     python3.11 -m venv --symlinks --upgrade-deps $VIRTUAL_ENV
 
 COPY --chown=$RUNUSER:$RUNUSER src /opt/package/src
diff --git a/src/server/Dockerfile b/src/server/Dockerfile
index 25971cb0..a35f034b 100644
--- a/src/server/Dockerfile
+++ b/src/server/Dockerfile
@@ -6,7 +6,7 @@
 #  podman build -f src/server/Dockerfile -t ai-optimizer-server:latest .
 #############################################################
 # spell-checker: disable
-FROM container-registry.oracle.com/os/oraclelinux:8-slim AS optimizer_base
+FROM container-registry.oracle.com/os/oraclelinux:8 AS optimizer_base
 
 ENV RUNUSER=oracleai
 ENV RUNUSER=oracleai \
@@ -14,8 +14,9 @@ ENV RUNUSER=oracleai \
 
 RUN groupadd -g 10001 $RUNUSER && \
     useradd -u 10001 -g $RUNUSER -md /app $RUNUSER && \
-    microdnf --nodocs -y install python3.11 python3.11-pip && \
-    microdnf clean all && \
+    dnf config-manager --add-repo https://yum.oracle.com/repo/OracleLinux/OL8/oracle/software/\$basearch && \
+    dnf --nodocs -y install python3.11 python3.11-pip && \
+    dnf clean all && \
     python3.11 -m venv --symlinks --upgrade-deps $VIRTUAL_ENV
 
 COPY --chown=$RUNUSER:$RUNUSER src /opt/package/src