diff --git a/.drone.yml b/.drone.yml
index b8b0879..e70556b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,54 +1,9 @@
-    pipeline:
-      prebuild:
-        image: golang:1.9
-        commands:
-          - IMAGE=dr.dnix.de/$DRONE_REPO_NAME
-          - REV=$(git rev-list HEAD --count)
-          - BUILDDATE=$(date)
-          - BRANCH=$DRONE_COMMIT_BRANCH
-          - VERSIONGO=version.go
-          - TAGS=.tags
-          - echo "Building image $IMAGE:$BRANCH-$REV"
-          - echo  "package main" >$VERSIONGO
-          - echo "" >>$VERSIONGO
-          - echo "const (" >>$VERSIONGO
-          - echo -n "    FlokatiVersion = \"" >>$VERSIONGO
-          - echo -n "$BRANCH" >>$VERSIONGO
-          - echo "\"" >>$VERSIONGO
-          - echo -n "    FlokatiBuild   = \"" >>$VERSIONGO
-          - echo -n "$REV" >>$VERSIONGO
-          - echo "\"" >>$VERSIONGO
-          - echo -n "    FlokatiBuilddate = \"" >>$VERSIONGO
-          - echo -n "$BUILDDATE" >>$VERSIONGO
-          - echo "\"" >>$VERSIONGO
-          - echo ")" >>$VERSIONGO
-          - cat $VERSIONGO
-          - echo -n "$BRANCH-$REV" >$TAGS
-          - cat $TAGS
-      build_docker:
-        image: plugins/docker
-        repo: dr.dnix.de/${DRONE_REPO_NAME}
-        tags:
-          - latest
-      deploy:
-        image: ubuntu:16.04
-        commands:
-          - apt update
-          - apt -y upgrade
-          - apt install -y git
-          - IMAGE=dr.dnix.de/$DRONE_REPO_NAME
-          - BRANCH=$DRONE_COMMIT_BRANCH
-          - REV=$(git rev-list HEAD --count)
-          - echo "Deploying image $IMAGE:$BRANCH-$REV"
-          - cd ~
-          - mkdir .ssh
-          - chmod 700 .ssh
-          - echo K8S_SSH_PRIVATE_KEY >.ssh/id_rsa
-          - chmod 600 .ssh/id_rsa
-          - echo K8S_SSH_PUBLIC_KEY >.ssh/id_rsa.pub
-          - chmod 600 .ssh/id_rsa.pub
-          - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-flokati mmflokati-flokati=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade"
-          - ssh -oStrictHostKeyChecking=no root@master01 "kubectl set image deployment/mmflokati-armleuchter mmflokati-armleuchter=dr.dnix.de/mmflokati:$BRANCH-$REV -n northbrigade"
-          - ssh -oStrictHostKeyChecking=no root@master01 "kubectl rollout status deployment/mmflokati-flokati -n northbrigade"
-          - ssh -oStrictHostKeyChecking=no root@master01 "kubectl rollout status deployment/mmflokati-armleuchter -n northbrigade"
-
+pipeline:
+  build:
+    image: golang:1.6
+    environment:
+      - FOO=1
+    commands:
+      - go get -a -v
+      - make test
+      - make build
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index e69de29..e126cdc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "vendor/git.dnix.de/an/xlog"]
+	path = vendor/git.dnix.de/an/xlog
+	url = https://git.dnix.de/an/xlog
+[submodule "vendor/git.dnix.de/an/flokatilib"]
+	path = vendor/git.dnix.de/an/flokatilib
+	url = https://git.dnix.de/an/flokatilib
diff --git a/vendor/git.dnix.de/an/flokatilib b/vendor/git.dnix.de/an/flokatilib
new file mode 160000
index 0000000..3c7b7e5
--- /dev/null
+++ b/vendor/git.dnix.de/an/flokatilib
@@ -0,0 +1 @@
+Subproject commit 3c7b7e572723ac26e7f821dfd3528c0d04253faa
diff --git a/vendor/git.dnix.de/an/xlog b/vendor/git.dnix.de/an/xlog
new file mode 160000
index 0000000..e754765
--- /dev/null
+++ b/vendor/git.dnix.de/an/xlog
@@ -0,0 +1 @@
+Subproject commit e7547652aef671a5acb3fa66625b007c2c75251c