diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 3fc65a2..68be4a0 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -9,7 +9,7 @@ on:
 jobs:
 
   build:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - run: docker build . -t raspberrypi99/request-mirror
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index 8555747..a6d677a 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -8,7 +8,7 @@ on:
 jobs:
 
   build:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - run: docker build . -t raspberrypi99/request-mirror
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e06d0b9..98f1848 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -11,9 +11,7 @@ env:
 
 jobs:
   build:
-
-    runs-on: self-hosted
-
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
diff --git a/Dockerfile b/Dockerfile
index 7bda313..a256a0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM rustlang/rust:nightly as builder
+FROM rustlang/rust:nightly AS builder
 WORKDIR /app
 COPY src ./src
 COPY Cargo.toml .
 COPY Cargo.lock .
 RUN cargo install --path .
 
-FROM rustlang/rust:nightly as runner
+FROM rustlang/rust:nightly AS runner
 COPY migrations /migrations
 RUN cargo install diesel_cli --no-default-features --features postgres
-RUN apt update && apt install -y libpq-dev libc6
+RUN apt update && apt upgrade -y && apt install -y libpq-dev libc6
 COPY --from=builder /usr/local/cargo/bin/request-mirror /usr/local/bin/request-mirror
 COPY ./templates /templates
 COPY .env.docker /.env