diff --git a/.drone.yml b/.drone.yml
index 572a9815..596a977c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,10 +2,8 @@
 kind: pipeline
 type: kubernetes
 name: crowdin
-
 metadata:
   namespace: git
-
 steps:
   - name: Update Translations
     image: crowdin/cli
@@ -17,7 +15,8 @@ steps:
   - name: Push changes
     image: node:current-bullseye
     commands:
-      - npx yarn workspace @snort/app format
+      - yarn install
+      - yarn workspace @snort/app format
       - apt update && apt install git -y
       - git switch lang
       - git commit -a -m "Update translations"
@@ -26,10 +25,8 @@ steps:
 kind: pipeline
 type: kubernetes
 name: docker
-
 metadata:
   namespace: git
-
 steps:
   - name: build docker image
     image: r.j3ss.co/img
@@ -42,8 +39,7 @@ steps:
         from_secret: img_token
     commands:
       - img login -u kieran -p $TOKEN git.v0l.io
-      - |-
-        img build -t git.v0l.io/kieran/snort:latest \
+      - img build -t git.v0l.io/kieran/snort:latest \
         --platform linux/amd64,linux/arm64 \
         --cache-from "type=local,src=/docker-cache" \
         --cache-to "type=local,dest=/docker-cache" \
@@ -52,4 +48,19 @@ steps:
 volumes:
 - name: cache
   claim:
-    name: docker-cache
\ No newline at end of file
+    name: docker-cache
+---
+kind: pipeline
+type: kubernetes
+name: test-lint
+metadata:
+  namespace: git
+steps:
+  - name: Test/Lint
+    image: node:current-bullseye
+    commands:
+      - yarn install
+      - yarn workspace @snort/nostr build
+      - yarn workspace @snort/app test
+      - yarn workspace @snort/app eslint
+      - yarn workspace @snort/app prettier --check .
\ No newline at end of file
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
deleted file mode 100644
index 5e8a8995..00000000
--- a/.github/workflows/docker.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Docker build
-on:
-  push:
-    branches: [main]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/checkout@v2
-      - uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/setup-qemu-action@v2
-      - uses: docker/setup-buildx-action@v2
-      - name: Build the Docker image
-        run: | 
-          docker buildx build \
-          -t ghcr.io/${{ github.repository_owner }}/snort:latest \
-          --platform linux/amd64,linux/arm64 \
-          --cache-from "type=local,src=/tmp/.buildx-cache" \
-          --cache-to "type=local,dest=/tmp/.buildx-cache" \
-          --push .
diff --git a/.github/workflows/test-lint.yaml b/.github/workflows/test-lint.yaml
deleted file mode 100644
index bc3a2cf9..00000000
--- a/.github/workflows/test-lint.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Test+Lint
-on:
-  pull_request:
-jobs:
-  test_and_lint:
-    timeout-minutes: 15
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 19
-      - name: Install Dependencies
-        run: yarn install
-      - name: Build packages
-        run: yarn workspace @snort/nostr build
-      - name: Run tests
-        run: yarn workspace @snort/app test
-      - name: Check Eslint
-        run: yarn workspace @snort/app eslint
-      - name: Check Formatting
-        run: yarn workspace @snort/app prettier --check .