diff --git a/.dockerignore b/.dockerignore
index 197f5fd..547322a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,7 +3,11 @@ docker/
 docs/
 scripts/
 
-debug.Dockerfile
+.idea/
+.dockerignore
+
+build_buffer.sh
+README.md
 
 # Include files:
 !docker/example_detector.json
diff --git a/buffer.Dockerfile b/buffer.Dockerfile
new file mode 100644
index 0000000..ff8f9c0
--- /dev/null
+++ b/buffer.Dockerfile
@@ -0,0 +1,13 @@
+FROM paulscherrerinstitute/std-daq-buffer-base:1.0.2
+
+COPY . /std_daq_buffer/
+
+RUN mkdir /std_daq_buffer/build && \
+    cd /std_daq_buffer/build && \
+    # Build the project
+    cmake3 .. -DUSE_EIGER=1 && \
+    make && \
+    # Deploy the test config.
+    cp /std_daq_buffer/docker/example_detector.json .
+
+WORKDIR /std_daq_buffer/build
diff --git a/build_buffer.sh b/build_buffer.sh
new file mode 100644
index 0000000..7ce8ff3
--- /dev/null
+++ b/build_buffer.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+VERSION=1.0.0
+
+docker build --no-cache=true -f buffer.Dockerfile -t paulscherrerinstitute/std-daq-buffer .
+docker tag paulscherrerinstitute/sf-daq-buffer paulscherrerinstitute/std-daq-buffer:$VERSION
+
+docker login
+docker push paulscherrerinstitute/std-daq-buffer:$VERSION
+docker push paulscherrerinstitute/std-daq-buffer
\ No newline at end of file
diff --git a/debug.Dockerfile b/debug.Dockerfile
deleted file mode 100644
index 43bc6d4..0000000
--- a/debug.Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM paulscherrerinstitute/sf-daq_phdf5:1.0.2
-
-COPY . /sf_daq_buffer/
-
-RUN mkdir /sf_daq_buffer/build && \
-    cd /sf_daq_buffer/build && \
-    # Build the project
-    cmake3 .. -DUSE_EIGER=1 && \
-    make && \
-    # Deploy the test config.
-    cp /sf_daq_buffer/docker/example_detector.json .
-
-WORKDIR /sf_daq_buffer/build
diff --git a/docker/build_buffer-base.sh b/docker/build_buffer-base.sh
index c7f2af0..7933efd 100644
--- a/docker/build_buffer-base.sh
+++ b/docker/build_buffer-base.sh
@@ -2,9 +2,9 @@
 
 VERSION=1.0.2
 
-docker build --no-cache=true -f buffer-base.Dockerfile -t paulscherrerinstitute/sf-daq-buffer-base .
-docker tag paulscherrerinstitute/sf-daq-buffer-base paulscherrerinstitute/sf-daq-buffer-base:$VERSION
+docker build --no-cache=true -f buffer-base.Dockerfile -t paulscherrerinstitute/std-daq-buffer-base .
+docker tag paulscherrerinstitute/std-daq-buffer-base paulscherrerinstitute/std-daq-buffer-base:$VERSION
 
 docker login
-docker push paulscherrerinstitute/sf-daq-buffer-base:$VERSION
-docker push paulscherrerinstitute/sf-daq-buffer-base
\ No newline at end of file
+docker push paulscherrerinstitute/std-daq-buffer-base:$VERSION
+docker push paulscherrerinstitute/std-daq-buffer-base
\ No newline at end of file