diff --git a/pom.xml b/pom.xml
index 7585010..992f153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,6 +188,22 @@
                             <goal>resources</goal>
                         </goals>
                     </execution>
+		      <execution>
+			<id>copy-docker</id>
+			<phase>validate</phase>
+			<goals>
+			  <goal>copy-resources</goal>
+			</goals>
+			<configuration>
+			  <outputDirectory>${basedir}/target</outputDirectory>
+			  <resources>
+			    <resource>
+				<directory>src/main/docker</directory>
+				<filtering>true</filtering>
+			    </resource>
+			  </resources>
+			</configuration>
+		      </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -201,14 +217,18 @@
                         <feature>uAAL-MW</feature>
                     </bootFeatures>
                     <!-- <installedFeatures/> -->
-					<installedFeatures>
-                        <feature>uAAL-Ont.PhWorld</feature>
-                        <feature>uAAL-Ont.Device</feature>
-                        <feature>uAAL-Ont.CHe</feature>
-                        <feature>uAAL-Ont.Profile</feature>
-					</installedFeatures>
+		    <installedFeatures>
+	                <feature>uAAL-Ont.PhWorld</feature>
+	                <feature>uAAL-Ont.Device</feature>
+	                <feature>uAAL-Ont.CHe</feature>
+	                <feature>uAAL-Ont.Profile</feature>
+		    </installedFeatures>
                 </configuration>
-            </plugin>
+	   </plugin>
+	<!-- TODO look into maven-docker plugins to automatically build and deploy docker.
+		https://dmp.fabric8.io/
+		https://github.com/spotify/docker-maven-plugin
+	-->
         </plugins>
     </build>
 
diff --git a/src/main/docker/Dokerfile b/src/main/docker/Dockerfile
similarity index 65%
rename from src/main/docker/Dokerfile
rename to src/main/docker/Dockerfile
index e641936..1069622 100644
--- a/src/main/docker/Dokerfile
+++ b/src/main/docker/Dockerfile
@@ -3,7 +3,10 @@ LABEL maintainer="amedrano@lst.tfo.upm.es"
 #ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 
 RUN mkdir /uAAL
-COPY ../../../target/assembly/* /uAAL/
+COPY assembly/ /uAAL/
+
+#RUN ls -lha /uAAL/
+#RUN chmod +x /uAAL/bin
 
 VOLUME ["/uAAL/data"]
 VOLUME ["/uAAL/etc"]
@@ -13,6 +16,6 @@ EXPOSE 8081 9000
 #TODO expose uAAL discovering and peering ports
 #EXPOSE 1099 8101 44444 # Karaf ports
 
-sed -i "21s/out/stdout/" /uAAL/etc/org.ops4j.pax.logging.cfg;
+RUN sed -i "21s/out/stdout/" /uAAL/etc/org.ops4j.pax.logging.cfg;
 
-CMD ["/uAAL/bin/karaf"]
\ No newline at end of file
+CMD ["/uAAL/bin/karaf"]