diff --git a/Dockerfile b/Dockerfile
index 6e54cace..0463dfa0 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,6 @@ FROM oraclelinux:9-slim
 LABEL maintainer="Team at Oracle"
 LABEL description="OCI format to generate CD3 image"
 
-
 ########### Input Parameters for image creation ############
 # UID of user on underlying OS. eg 503 for Mac
 ARG USER_UID=1001
@@ -10,7 +9,6 @@ ARG USER_UID=1001
 ARG USE_DEVOPS=YES
 #############################################################
 
-
 ARG USERNAME=cd3user
 ARG USER_GID=$USER_UID
 # Whether to download Provider as part of image creation
@@ -19,6 +17,7 @@ ARG DOWNLOAD_PROVIDER=YES
 ARG TF_OCI_PROVIDER=6.15.0
 ARG TF_NULL_PROVIDER=3.2.1
 
+# Install sudo and other required dependencies
 RUN microdnf install -y sudo && \
     groupadd --gid $USER_GID $USERNAME && \
     useradd --uid $USER_UID --gid $USER_GID -d /$USERNAME -m $USERNAME && \
@@ -40,66 +39,27 @@ COPY othertools othertools/
 
 WORKDIR /cd3user/
 
-RUN  sudo dnf install -y oraclelinux-release-el9 && \
-sudo chown -R $USERNAME:$USERNAME /cd3user/ && \
-sudo sed -i -e 's/\r$//' /cd3user/oci_tools/cd3_automation_toolkit/shell_script.sh && \
-bash /cd3user/oci_tools/cd3_automation_toolkit/shell_script.sh && \
-sudo dnf clean all && \
-sudo rm -rf /var/cache/dnf && \
-sudo chmod -R 740 /cd3user/ && \
-sudo chown -R cd3user:cd3user /cd3user/
-
+# Install Oracle Linux release and run shell script
+RUN dnf install -y oraclelinux-release-el9 && \
+    chown -R $USERNAME:$USERNAME /cd3user/ && \
+    sed -i -e 's/\r$//' /cd3user/oci_tools/cd3_automation_toolkit/shell_script.sh && \
+    bash -x /cd3user/oci_tools/cd3_automation_toolkit/shell_script.sh && \
+    dnf clean all && \
+    rm -rf /var/cache/dnf && \
+    chmod -R 740 /cd3user/ && \
+    chown -R cd3user:cd3user /cd3user/
 
+# Download providers if requested
 RUN if [ "$DOWNLOAD_PROVIDER" == "YES" ]; then \
-# oci provider
-sudo wget https://releases.hashicorp.com/terraform-provider-oci/${TF_OCI_PROVIDER}/terraform-provider-oci_${TF_OCI_PROVIDER}_linux_amd64.zip && \
-sudo mkdir -p /cd3user/.terraform.d/plugins/registry.terraform.io/oracle/oci/${TF_OCI_PROVIDER}/linux_amd64 && \
-sudo unzip terraform-provider-oci_${TF_OCI_PROVIDER}_linux_amd64.zip -d /cd3user/.terraform.d/plugins/registry.terraform.io/oracle/oci/${TF_OCI_PROVIDER}/linux_amd64 && \
-# null provider
-sudo wget https://releases.hashicorp.com/terraform-provider-null/${TF_NULL_PROVIDER}/terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip && \
-sudo mkdir -p /cd3user/.terraform.d/plugins/registry.terraform.io/hashicorp/null/${TF_NULL_PROVIDER}/linux_amd64 && \
-sudo unzip terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip -d /cd3user/.terraform.d/plugins/registry.terraform.io/hashicorp/null/${TF_NULL_PROVIDER}/linux_amd64 && \
-sudo cp -r /cd3user/.terraform.d/plugins/registry.terraform.io /cd3user/.terraform.d/plugins/registry.opentofu.org && \
-sudo chown -R cd3user:cd3user /cd3user/ && \
-sudo rm -rf terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip terraform-provider-oci_${TF_OCI_PROVIDER}_linux_amd64.zip ;\
-fi
-
-##################################### START INSTALLING JENKINS ###################################
-ARG JENKINS_VERSION=2.444
-ARG JENKINS_SHA=ab093a455fc35951c9b46361002e17cc3ed7c59b0943bbee3a57a363f3370d2e
-ARG JENKINS_PLUGIN_MANAGER_VERSION=2.12.13
-ARG PLUGIN_CLI_URL=https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/${JENKINS_PLUGIN_MANAGER_VERSION}/jenkins-plugin-manager-${JENKINS_PLUGIN_MANAGER_VERSION}.jar
-
-ARG JENKINS_HOME=/cd3user/tenancies/jenkins_home
-ARG JENKINS_INSTALL=/usr/share/jenkins
-ARG REF=/usr/share/jenkins/ref
-
-ENV USE_DEVOPS ${USE_DEVOPS}
-ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk
-ENV JENKINS_HOME ${JENKINS_HOME}
-ENV JENKINS_INSTALL ${JENKINS_INSTALL}
-ENV REF ${REF}
-ENV JENKINS_UC https://updates.jenkins.io
-ENV JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental
-ENV JENKINS_INCREMENTALS_REPO_MIRROR=https://repo.jenkins-ci.org/incrementals
-ENV JAVA_OPTS="-Djenkins.install.runSetupWizard=false"
-ENV COPY_REFERENCE_FILE_LOG ${JENKINS_HOME}/copy_reference_file.log
-ENV CASC_JENKINS_CONFIG ${JENKINS_HOME}/jcasc.yaml
-COPY --chown=cd3user:cd3user jenkins_install ${JENKINS_INSTALL}/
-COPY --chown=cd3user:cd3user jenkins_install/init/*.groovy ${REF}/init.groovy.d/
-COPY --chown=cd3user:cd3user jenkins_install/plugins.txt ${REF}/plugins.txt
-
-
-RUN if [ "$USE_DEVOPS" == "YES" ]; then \
-    sudo microdnf install -y java-21-openjdk && \
-    sudo microdnf install -y java-21-openjdk-devel && \
-    sudo microdnf install git-2.39.3 -y && \
-    sudo mkdir -p ${REF}/init.groovy.d && \
-    sudo chown -R cd3user:cd3user ${JENKINS_INSTALL} && \
-    sudo curl -fsSL http://updates.jenkins-ci.org/download/war/${JENKINS_VERSION}/jenkins.war -o ${JENKINS_INSTALL}/jenkins.war && \
-    echo "${JENKINS_SHA}  ${JENKINS_INSTALL}/jenkins.war" | sha256sum -c - && \
-    sudo curl -fsSL ${PLUGIN_CLI_URL} -o ${JENKINS_INSTALL}/jenkins-plugin-manager.jar && \
-    sudo java -jar ${JENKINS_INSTALL}/jenkins-plugin-manager.jar --war ${JENKINS_INSTALL}/jenkins.war --verbose -f ${REF}/plugins.txt && \
-    sudo chown -R cd3user:cd3user ${JENKINS_INSTALL} && \
-    sudo chmod +x ${JENKINS_INSTALL}/jenkins.sh ; \
+    # OCI provider
+    wget https://releases.hashicorp.com/terraform-provider-oci/${TF_OCI_PROVIDER}/terraform-provider-oci_${TF_OCI_PROVIDER}_linux_amd64.zip && \
+    mkdir -p /cd3user/.terraform.d/plugins/registry.terraform.io/oracle/oci/${TF_OCI_PROVIDER}/linux_amd64 && \
+    unzip terraform-provider-oci_${TF_OCI_PROVIDER}_linux_amd64.zip -d /cd3user/.terraform.d/plugins/registry.terraform.io/oracle/oci/${TF_OCI_PROVIDER}/linux_amd64 && \
+    # Null provider
+    wget https://releases.hashicorp.com/terraform-provider-null/${TF_NULL_PROVIDER}/terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip && \
+    mkdir -p /cd3user/.terraform.d/plugins/registry.terraform.io/hashicorp/null/${TF_NULL_PROVIDER}/linux_amd64 && \
+    unzip terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip -d /cd3user/.terraform.d/plugins/registry.terraform.io/hashicorp/null/${TF_NULL_PROVIDER}/linux_amd64 && \
+    cp -r /cd3user/.terraform.d/plugins/registry.terraform.io /cd3user/.terraform.d/plugins/registry.opentofu.org && \
+    chown -R cd3user:cd3user /cd3user/ && \
+    rm -rf terraform-provider-null_${TF_NULL_PROVIDER}_linux_amd64.zip terraform-provider-oci_${TF_OCI_PROVIDER}_linux_amd64.zip ;\
     fi