diff --git a/pom.xml b/pom.xml
index 4a738eb42..c19c31ace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,20 @@
 
     <modules>
         <module>udc-backend</module>
-        <!--<module>udc-containers</module>-->
+        <module>udc-containers</module>
     </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
diff --git a/udc-containers/pom.xml b/udc-containers/pom.xml
index fb303d24e..6d7904768 100644
--- a/udc-containers/pom.xml
+++ b/udc-containers/pom.xml
@@ -24,7 +24,7 @@
 
         <docker.skip.build>true</docker.skip.build>
         <docker.skip.push>true</docker.skip.push>
-        <docker.baseImage>TODO</docker.baseImage>
+        <docker.baseImage>openjdk:8-jre</docker.baseImage>
         <docker.repository>university-course</docker.repository>
         <docker.registry.host>localhost</docker.registry.host>
     </properties>
diff --git a/udc-containers/udc-backend-service/pom.xml b/udc-containers/udc-backend-service/pom.xml
index ed5aaf49b..a8569cbca 100644
--- a/udc-containers/udc-backend-service/pom.xml
+++ b/udc-containers/udc-backend-service/pom.xml
@@ -41,8 +41,8 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>TODO</groupId>
-                                    <artifactId>TODO</artifactId>
+                                    <groupId>org.springframework.samples</groupId>
+                                    <artifactId>udc-backend</artifactId>
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
diff --git a/udc-containers/udc-backend-service/src/main/resources/Dockerfile b/udc-containers/udc-backend-service/src/main/resources/Dockerfile
index f0e025cb5..e3442f0f9 100644
--- a/udc-containers/udc-backend-service/src/main/resources/Dockerfile
+++ b/udc-containers/udc-backend-service/src/main/resources/Dockerfile
@@ -1,10 +1,17 @@
 FROM ${docker.baseImage}
 
-EXPOSE 8080
-ENTRYPOINT ["/docker-entrypoint.sh"]
-WORKDIR "/udc/apps/petclinic"
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US.UTF-8 \
+    LC_ALL=en_US.UTF-8
 
-COPY docker-entrypoint.sh /docker-entrypoint.sh
+ENV BASE_DIR='/udc/apps/petclinic'
+
+EXPOSE 8080
+ENTRYPOINT ["/entrypoint.sh"]
+
+RUN mkdir -p ${BASE_DIR}
+
+COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
 COPY todo.jar /udc/apps/petclinic/todo.jar
diff --git a/udc-containers/udc-backend-service/src/main/resources/docker-entrypoint.sh b/udc-containers/udc-backend-service/src/main/resources/entrypoint.sh
similarity index 100%
rename from udc-containers/udc-backend-service/src/main/resources/docker-entrypoint.sh
rename to udc-containers/udc-backend-service/src/main/resources/entrypoint.sh