diff --git a/build/dockerfiles/production/Dockerfile b/Dockerfile
similarity index 84%
rename from build/dockerfiles/production/Dockerfile
rename to Dockerfile
index f5e6234220b0e050b81eca99b3c98ecd38a25e8b..d24398d35eb7fb7a7a2df423ea4c6dba23501d0f 100644
--- a/build/dockerfiles/production/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 FROM golang:1.15-alpine AS builder
 ARG GITLAB_USER
 ARG GITLAB_TOKEN
+ARG BUILDARGS
 WORKDIR /src/gosdn
 COPY . .
 RUN apk add git
 RUN git config --global url."https://$GITLAB_USER:$GITLAB_TOKEN@code.fbi.h-da.de".insteadOf "https://code.fbi.h-da.de"
-RUN go mod download
-RUN CGO_ENABLED=0 GOOS=linux go build ./cmd/gosdn
+RUN CGO_ENABLED=0 GOOS=linux go build $BUILDARGS ./cmd/gosdn
 
 FROM alpine:latest
 EXPOSE 8080
diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index 3cb6c3d7e33fd4801176368d4b49fef3e6aa05b5..570917e7ff28e17e88f9b6b7820e367ead519471 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -26,6 +26,7 @@ variables:
 build:develop:
   variables:
     TAG: $CI_REGISTRY_IMAGE:develop
+    BUILDARGS: -race
     DOCKERFILE: build/dockerfiles/staging
   rules:
     - if: $CI_COMMIT_BRANCH == "develop"
@@ -34,6 +35,7 @@ build:develop:
 build:merge-request:
   variables:
     TAG: $CI_REGISTRY_IMAGE:merge-request
+    BUILDARGS: -race
     DOCKERFILE: build/dockerfiles/staging
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
diff --git a/build/dockerfiles/staging/Dockerfile b/build/dockerfiles/staging/Dockerfile
deleted file mode 100644
index 99fb1ce3112c1d3c8142adf54b6e4611c15c5107..0000000000000000000000000000000000000000
--- a/build/dockerfiles/staging/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM golang:1.15-alpine AS builder
-ARG GITLAB_USER
-ARG GITLAB_TOKEN
-WORKDIR /src/gosdn
-COPY . .
-RUN apk add git
-RUN git config --global url."https://$GITLAB_USER:$GITLAB_TOKEN@code.fbi.h-da.de".insteadOf "https://code.fbi.h-da.de"
-RUN go mod download
-RUN CGO_ENABLED=0 GOOS=linux go build -race ./cmd/gosdn
-
-FROM alpine:latest
-EXPOSE 8080
-EXPOSE 55055
-COPY --from=builder /src/gosdn/gosdn .
-COPY --from=builder /src/gosdn/configs ./configs
-
-ENTRYPOINT [ "./gosdn" ]
-CMD [""]