diff --git a/images/build-stage/3.6/Dockerfile b/images/build-stage/3.6/Dockerfile
index e9f68ef..00ba0bd 100644
--- a/images/build-stage/3.6/Dockerfile
+++ b/images/build-stage/3.6/Dockerfile
@@ -13,9 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+FROM oraclelinux:8-slim
 
-FROM python:3.6-slim-stretch
+RUN microdnf install -y python36 &&\
+    microdnf clean all
 
-RUN apt-get update && apt-get upgrade -qy && \
-    apt-get install --no-install-recommends -qy build-essential gcc && \
-    apt-get clean
+RUN pip3 install --upgrade pip && pip3 cache purge
+
+CMD ["python3"]
diff --git a/images/build-stage/3.8/Dockerfile b/images/build-stage/3.8/Dockerfile
index 850a9f6..b835a00 100644
--- a/images/build-stage/3.8/Dockerfile
+++ b/images/build-stage/3.8/Dockerfile
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+FROM oraclelinux:8-slim
 
-FROM python:3.8-slim
+RUN microdnf install -y python38 &&\
+    microdnf install -y python38-pip &&\
+    microdnf clean all
 
-RUN apt-get update && apt-get upgrade -qy && \
-    apt-get install --no-install-recommends -qy build-essential gcc && \
-    apt-get clean
+CMD ["python3"]
\ No newline at end of file
diff --git a/images/runtime/3.6/Dockerfile b/images/runtime/3.6/Dockerfile
index 01f166e..8f75660 100644
--- a/images/runtime/3.6/Dockerfile
+++ b/images/runtime/3.6/Dockerfile
@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-FROM python:3.6-slim-stretch
+FROM oraclelinux:8-slim
 
-RUN apt-get update && apt-get upgrade -qy && apt-get clean
-RUN addgroup --system --gid 1000 --system fn && adduser --system --uid 1000 --ingroup fn fn
+RUN microdnf install -y python36 &&\
+    microdnf clean all
+RUN groupadd --system --gid 1000 fn && adduser --system --uid 1000 --gid fn fn
diff --git a/images/runtime/3.8/Dockerfile b/images/runtime/3.8/Dockerfile
index d2e758b..20f3a0c 100644
--- a/images/runtime/3.8/Dockerfile
+++ b/images/runtime/3.8/Dockerfile
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 
-FROM python:3.8-slim
+#FROM docker-remote.artifactory.oci.oraclecorp.com/python:3.8-slim
+FROM oraclelinux:8-slim
 
-RUN apt-get update && apt-get upgrade -qy && apt-get clean
-RUN addgroup --system --gid 1000 fn && adduser --system --uid 1000 --ingroup fn fn
+#RUN apt-get update && apt-get upgrade -qy && apt-get clean
+RUN microdnf install -y python38 &&\
+    microdnf install -y python38-pip &&\
+    microdnf clean all
+
+#RUN addgroup --system --gid 1000 fn && adduser --system --uid 1000 --ingroup fn fn
+RUN groupadd --system --gid 1000 fn && adduser --system --uid 1000 --gid fn fn