diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index a43dd9a..3848d2e 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -599,10 +599,6 @@
             <activation>
                 <activeByDefault>false</activeByDefault>
             </activation>
-            <properties>
-                <docker.username>docker</docker.username>
-                <docker.password>docker</docker.password>
-            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -641,7 +637,7 @@
                         <configuration>
                             <verbose>${verbose}</verbose>
                             <apiVersion>${docker.api.version}</apiVersion>
-                            <registry>nexus3.onap.org:10001</registry>
+                            <registry>${docker.registry}</registry>
                             <authConfig>
                                 <pull>
                                     <username>${docker.username}</username>
@@ -652,7 +648,7 @@
 
                                 <!-- Build frontend image -->
                                 <image>
-                                    <name>onap/sdc-frontend</name>
+                                    <name>${docker.namespace}/sdc-frontend</name>
                                     <alias>sdc-frontend</alias>
                                     <build>
                                         <cleanup>try</cleanup>
@@ -679,7 +675,7 @@
                                 </goals>
                                 <configuration>
                                     <removeAll>true</removeAll>
-                                    <image>onap/sdc-frontend</image>
+                                    <image>${docker.namespace}/sdc-frontend</image>
                                 </configuration>
                             </execution>
 
@@ -698,7 +694,7 @@
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>
-                                    <image>onap/sdc-frontend</image>
+                                    <image>${docker.namespace}/sdc-frontend</image>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index 9e5fad6..005e5c9 100644
--- a/catalog-fe/sdc-frontend/Dockerfile
+++ b/catalog-fe/sdc-frontend/Dockerfile
@@ -26,7 +26,7 @@
 USER onap
 
 #Download jetty
-RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.41.v20210516/jetty-distribution-9.4.41.v20210516.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
+RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.version}/jetty-distribution-${jetty.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
         tar xvz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \
         rm -rf $JETTY_FOLDER/jetty.tar.gz
 RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml