diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..6b8710a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+.git
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ff9f7de
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "FOX"]
+	path = FOX
+	url = https://github.com/AKSW/FOX.git
diff --git a/Dockerfile b/Dockerfile
index d0f4f15..f793640 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,8 @@ MAINTAINER Rene Pietzsch <rene.pietzsch@eccenca.com>
 
 # Let the conatiner know that there is no tty
 ENV DEBIAN_FRONTEND noninteractive
+ENV LNG de
+ENV XMX 8G
 
 # update ubuntu trusty
 RUN \
@@ -25,10 +27,15 @@ RUN \
   apt-get install -y oracle-java8-installer
 
 RUN mkdir /FOX
+ADD FOX /FOX
 WORKDIR /FOX
-RUN git clone https://github.com/AKSW/FOX.git /FOX
-RUN ./build.sh
+# RUN git clone https://github.com/AKSW/FOX.git /FOX
+RUN mvn package
+# RUN ./build.sh
 WORKDIR /FOX/release
 RUN cp fox.properties-dist fox.properties
+ADD learn-and-run-fox.sh /FOX/release/learn-and-run-fox.sh
+
+CMD ./learn-and-run-fox.sh
 
 EXPOSE 4444
diff --git a/FOX b/FOX
new file mode 160000
index 0000000..51715e8
--- /dev/null
+++ b/FOX
@@ -0,0 +1 @@
+Subproject commit 51715e8fa9ad24c468e1f15d87c49cf96166c57b
diff --git a/Makefile b/Makefile
index 66b170f..3c36965 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .SILENT:
 
-VERSION=testing
+VERSION=$(shell cd FOX; git describe --always --dirty)
 
 default: help
 
@@ -8,6 +8,9 @@ default: help
 build:
 	docker build -t fox:$(VERSION) .
 
+tag:
+	docker tag fox:testing rpietzsch/fox:$(VERSION)
+
 ## This help screen
 help:
 	printf "Available targets\n\n"
diff --git a/learn-and-run-fox.sh b/learn-and-run-fox.sh
new file mode 100644
index 0000000..03b5e56
--- /dev/null
+++ b/learn-and-run-fox.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+sed -i -e 's#training: false#training: true#g' 'fox.properties'
+
+java -Xmx$XMX -cp fox-2.3.0-jar-with-dependencies.jar org.aksw.fox.FoxCLI -l$LNG -atrain -iinput/Wikiner/aij-wikiner-de-wp3.bz2 | tee learn.log
+
+sed -i -e 's#training: true#training: false#g' 'fox.properties'
+
+java -Xmx$XMX -cp fox-2.3.0-jar-with-dependencies.jar org.aksw.fox.FoxRESTful -l$LNG | tee run.log
\ No newline at end of file