diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51b732ac8..6dfab33d9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,11 +12,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64, amd64
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -43,11 +38,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64, amd64
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -75,11 +65,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64, amd64
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -106,11 +91,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64, amd64
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -137,11 +117,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64, amd64
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -168,11 +143,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64, amd64
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -199,11 +169,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64, amd64
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -230,11 +195,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64, amd64
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
diff --git a/conversion/Dockerfile b/conversion/Dockerfile
index 2eda1c5c1..845e6607b 100644
--- a/conversion/Dockerfile
+++ b/conversion/Dockerfile
@@ -9,6 +9,7 @@ RUN go build -o voltaserve-conversion
 
 FROM mcr.microsoft.com/playwright:jammy AS runner
 
+RUN add-apt-repository universe
 RUN apt-get update
 
 RUN apt-get install -y \
diff --git a/language/Dockerfile b/language/Dockerfile
index eeff75b3d..8351026fb 100644
--- a/language/Dockerfile
+++ b/language/Dockerfile
@@ -6,16 +6,7 @@ COPY . .
 
 RUN apt-get update
 
-RUN apt-get install -y curl build-essential
-
-RUN apt-get update && \
-  apt-get install -y curl && \
-  curl https://sh.rustup.rs -sSf | sh -s -- -y && \
-  /root/.cargo/bin/rustup default stable
-
-RUN curl -sSL https://install.python-poetry.org | python3 -
-
-ENV PATH="/root/.cargo/bin:/root/.local/bin:${PATH}"
+RUN apt-get install -y curl build-essential python3-poetry rust-all
 
 RUN poetry install --no-root