diff --git a/maincontainer/Dockerfile b/maincontainer/Dockerfile
index 701556b..aaae8fb 100644
--- a/maincontainer/Dockerfile
+++ b/maincontainer/Dockerfile
@@ -1,5 +1,6 @@
-# Use Red Hat Universal Base Image 8
-FROM registry.access.redhat.com/ubi8/ubi:latest
+
+# Use Execution Environment image based on Red Hat Universal Base Image 8
+FROM quay.io/agnosticd/ee-multicloud:latest
 
 # Software versions
 ENV CODE_SERVER_VERSION="4.10.0"
@@ -20,10 +21,12 @@ LABEL name="Code Server - Developer IDE" \
       release="1" \
       maintainer="Wolfgang Kulhanek <wkulhanek@redhat.com>"
 
-RUN dnf -y update && \
-    dnf -y install sudo git tar wget java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel && \
+#Install chrome for Unit Tests
+COPY *.repo /etc/yum.repos.d/
+RUN dnf -y install xdg-utils liberation-fonts google-chrome && dnf clean all
+
+RUN dnf -y install sudo git tar wget java-${JAVA_VERSION}-openjdk java-${JAVA_VERSION}-openjdk-devel && \
     dnf -y install https://github.com/coder/code-server/releases/download/v${CODE_SERVER_VERSION}/code-server-${CODE_SERVER_VERSION}-amd64.rpm && \
-    dnf -y install https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm && \
     rm -rf /var/cache/dnf /root/.cache
 
 # Install Maven
diff --git a/maincontainer/centos.repo b/maincontainer/centos.repo
new file mode 100644
index 0000000..943f249
--- /dev/null
+++ b/maincontainer/centos.repo
@@ -0,0 +1,11 @@
+[appstream]
+name=CentOS-$releasever - AppStream
+baseurl=http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/
+gpgcheck=0
+enabled=1
+
+[baseos]
+name=CentOS-$releasever - BaseOS
+baseurl=http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os
+gpgcheck=0
+enabled=1
diff --git a/maincontainer/google-chrome.repo b/maincontainer/google-chrome.repo
new file mode 100644
index 0000000..9d7e78f
--- /dev/null
+++ b/maincontainer/google-chrome.repo
@@ -0,0 +1,5 @@
+[google-chrome]
+name=google-chrome
+baseurl=http://dl.google.com/linux/chrome/rpm/stable/x86_64
+enabled=1
+gpgcheck=0