diff --git a/.husk/Dockerfile b/.docker/.husk/Dockerfile
similarity index 100%
rename from .husk/Dockerfile
rename to .docker/.husk/Dockerfile
diff --git a/.version b/.docker/.version
similarity index 100%
rename from .version
rename to .docker/.version
diff --git a/Makefile b/.docker/Makefile
similarity index 93%
rename from Makefile
rename to .docker/Makefile
index 704ff0b..7ef0b53 100644
--- a/Makefile
+++ b/.docker/Makefile
@@ -1,7 +1,7 @@
 LOCAL_USER_ID := $(shell id -u)
 export LOCAL_USER_ID
 
-include .env
+include ../.env
 include .version
 
 SHELL := /bin/bash
@@ -111,7 +111,7 @@ setup:
 
 init: setup
 	echo "Building project docker image ${PJT_DOCKER_IMAGE}"; \
-	docker build docker -t ${PJT_DOCKER_IMAGE} --build-arg DOCKER_SRC=${DOCKER_SRC} ${BUILD_ARGS};
+	docker build .. -t ${PJT_DOCKER_IMAGE} --build-arg DOCKER_SRC=${DOCKER_SRC} ${BUILD_ARGS};
 
 
 build:
@@ -131,8 +131,8 @@ ifneq (, ${XRANDR_CONF})
 	$(shell ${XRANDR_CONF})
 endif
 	@echo "Running docker image ${LOCAL_DOCKER_IMAGE}"
-	docker-compose -f docker-compose.yml -f docker-compose.base.yml ${NVIDIA_COMPOSE} up --remove-orphans
-	docker-compose down
+	docker-compose -f ../docker-compose.yml -f docker-compose.base.yml ${NVIDIA_COMPOSE} up --remove-orphans
+	docker-compose -f ../docker-compose.yml -f docker-compose.base.yml ${NVIDIA_COMPOSE} down
 
 distro: build
 	@echo "Pushing docker image ${PJT_DOCKER_IMAGE} on dockerhub"
diff --git a/docker-compose.base.yml b/.docker/docker-compose.base.yml
similarity index 88%
rename from docker-compose.base.yml
rename to .docker/docker-compose.base.yml
index 43ce4a6..16e99e5 100644
--- a/docker-compose.base.yml
+++ b/.docker/docker-compose.base.yml
@@ -30,6 +30,10 @@ services:
         source: ${XDG_RUNTIME_DIR}/pulse
         target: ${XDG_RUNTIME_DIR}/pulse
 
+      - type: bind
+        source: ${XDG_RUNTIME_DIR}/dconf
+        target: ${XDG_RUNTIME_DIR}/dconf
+
       - type: bind
         source: ./workdir
         target: /home/docky/workdir
diff --git a/docker-compose.nvidia.yml b/.docker/docker-compose.nvidia.yml
similarity index 100%
rename from docker-compose.nvidia.yml
rename to .docker/docker-compose.nvidia.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 72c9cee..a0c4591 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: write version
-        run: echo RELEASE_TAG=${{ github.event.release.tag_name }} > .version
+        run: echo RELEASE_TAG=${{ github.event.release.tag_name }} > .docker/.version
 
       - name: commit files
         run: |
@@ -44,4 +44,4 @@ jobs:
           branch: refs/heads/master
 
       - name: init build
-        run: make init build distro
+        run: cd .docker && make init build distro
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
index de444c2..cc13887 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,4 +8,4 @@ services:
     environment:
         - PROJECT_NAME=${PROJECT_NAME}
 
-    entrypoint: bash
+    command: terminator
diff --git a/docker/init.sh b/init.sh
similarity index 100%
rename from docker/init.sh
rename to init.sh