diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 2be040a..73a01a4 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -1,7 +1,7 @@
 name: Run tests
 on:
   push:
-    
+
 permissions:
   contents: read
 
@@ -16,8 +16,43 @@ jobs:
       - uses: actions/setup-go@v6
         with:
           go-version: ${{ matrix.go }}
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v9
+      #- name: golangci-lint
+      #  uses: golangci/golangci-lint-action@v9
+      #  with:
+      #    go-version: ${{ matrix.go }}
+      #    version: v2.6
+
+  build:
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
-          go-version: ${{ matrix.go }}
-          version: v2.6
+          go-version: stable
+      - name: Download modules
+        run:  go mod download -v
+      - name: Make build directory
+        run:  mkdir -p build
+      - name: Build hamview-collector
+        run:  go build -o build/ -v ./cmd/hamview-collector
+      - name: Build hamview-receiver
+        run:  go build -o build/ -v ./cmd/hamview-receiver
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Log into Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY}}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push collector container
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: hamview/collector:latest
+          context: cmd/hamview-collector
+      - name: Build and push receiver container
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: hamview/receiver:latest
+          context: cmd/hamview-receiver
diff --git a/.vscode/settings.json b/.vscode/settings.json
index be43a8d..2ff3820 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,4 +2,4 @@
     "gopls": {
         "formatting.local": "git.maze.io"
     }
-}
\ No newline at end of file
+}
diff --git a/cmd/hamview-collector/Dockerfile b/cmd/hamview-collector/Dockerfile
new file mode 100644
index 0000000..7991a0b
--- /dev/null
+++ b/cmd/hamview-collector/Dockerfile
@@ -0,0 +1,6 @@
+FROM        alpine:3
+WORKDIR     /opt/hamview
+COPY        ../../etc /etc/hamview
+COPY        ../../build/hamview-collector /opt/hamview/bin/hamview-collector
+ENTRYPOINT  ["bin/hamview-collector"]
+CMD         [ "executable" ]
diff --git a/cmd/hamview-receiver/Dockerfile b/cmd/hamview-receiver/Dockerfile
new file mode 100644
index 0000000..471f973
--- /dev/null
+++ b/cmd/hamview-receiver/Dockerfile
@@ -0,0 +1,6 @@
+FROM        alpine:3
+WORKDIR     /opt/hamview
+COPY        ../../etc /etc/hamview
+COPY        ../../build/hamview-receiver /opt/hamview/bin/hamview-receiver
+ENTRYPOINT  ["bin/hamview-receiver"]
+CMD         [ "protocol" ]
diff --git a/cmd/import-letsmesh-nodes/main.go b/cmd/import-letsmesh-nodes/main.go
index a04d7a8..c049c5f 100644
--- a/cmd/import-letsmesh-nodes/main.go
+++ b/cmd/import-letsmesh-nodes/main.go
@@ -159,7 +159,7 @@ func run(ctx context.Context, command *cli.Command) error {
 			)
 			ON CONFLICT (public_key)
 			DO UPDATE
-				SET 
+				SET
 					name = $3,
 					local_time = $4,
 					last_heard = $6,