diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 39c33fb..f6be78d 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -24,17 +24,12 @@ jobs:
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       -
-        name: Pull old base image
+        name: build
         run: |
           docker image pull webmultimedia/http-streaming-server-baseimage:dev
-      -
-        name: Build and export to Docker
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./backend/Dockerfile.baseimage
-          push: true
-          tags: webmultimedia/http-streaming-server-baseimage:dev
+          docker image build -f ./backend/Dockerfile.baseimage -t webmultimedia/http-streaming-server-baseimage:dev .
+          docker image push webmultimedia/http-streaming-server-baseimage:dev
+
   build-app:
     needs: build-baselayer
     runs-on: ubuntu-latest
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 5688d86..91d2b43 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -25,30 +25,11 @@ jobs:
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       -
-        name: Pull old base image
+        name: build
         run: |
           docker image pull webmultimedia/http-streaming-server-baseimage:master
-      -
-        name: Build and export to Docker
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./backend/Dockerfile.baseimage
-          push: true
-          tags: webmultimedia/http-streaming-server-baseimage:master
-      -
-        name: Test Backend
-        run: |
-          cp -r tests/* Videos/ 
-          docker-compose -f docker-compose-prod.yml run --rm web ./wait-for-it.sh db:5432 -- python3 manage.py test
-      -
-        name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./backend/Dockerfile.prod
-          push: true
-          tags: webmultimedia/http-streaming-server:master
+          docker image build -f ./backend/Dockerfile.baseimage -t webmultimedia/http-streaming-server-baseimage:master .
+          docker image push webmultimedia/http-streaming-server-baseimage:master
   build-app:
     needs: build-baselayer
     runs-on: ubuntu-latest