diff --git a/Jenkinsfile b/Jenkinsfile
index 6e3cb8e..5710c7b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,9 +9,26 @@ pipeline {
     }
 
     stages {
+        stage('Lint') {
+            steps {
+                script {
+                    catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
+                        sh 'make lint'
+                    }
+                }
+            }
+        }
+        stage('Test') {
+            steps {
+                script {
+                    sh 'make test'
+                }
+            }
+        }
         stage('Release') {
             steps {
                 script {
+                    sh 'make tidy'
                     sh 'ARCH_TARGETS="amd64 arm arm64" make release'
 
                     def attachments = sh(returnStdout: true, script: 'find release -maxdepth 1 -type f').split(' ')
diff --git a/Makefile b/Makefile
index ec53ef2..1a1e836 100644
--- a/Makefile
+++ b/Makefile
@@ -3,31 +3,16 @@ test:
 	go test -cover -v ./...
 
 watch:
-	modd	
+	go run -mod=readonly github.com/cortesi/modd/cmd/modd@latest
 
 release:
 	script/release
 
-deps:
-	GO111MODULE=off go get -u golang.org/x/tools/cmd/godoc
-	GO111MODULE=off go get -u github.com/cortesi/modd/cmd/modd
-	GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
-	GO111MODULE=off go get -u github.com/lmika/goseq
-
 tidy:
 	go mod tidy
 
 lint:
-	golangci-lint run --tests=false --enable-all
-
-sequence-diagram: sd-advertise sd-update sd-ping
-
-sd-%:
-	goseq doc/sequence-diagram/$*.seq > doc/sequence-diagram/$*.svg
-
-doc:
-	@echo "open your browser to http://localhost:6060/pkg/forge.cadoles.com/Cadoles/go-http-peering to see the documentation"
-	godoc -http=:6060
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0 run --tests=false --enable-all
 
 bin/keygen:
 	CGO_ENABLED=0 go build -o bin/keygen ./cmd/keygen
diff --git a/go.mod b/go.mod
index e0c1a2e..101583e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,16 @@
 module forge.cadoles.com/Cadoles/go-http-peering
 
 require (
-	github.com/davecgh/go-spew v1.1.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-chi/chi v3.3.3+incompatible
 	github.com/pborman/uuid v1.2.0
-	golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2
-	golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
 )
 
-go 1.13
+require (
+	github.com/google/uuid v1.0.0 // indirect
+	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
+	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
+)
+
+go 1.18
diff --git a/go.sum b/go.sum
index 36239e5..42b8549 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/go-chi/chi v3.3.3+incompatible h1:KHkmBEMNkwKuK4FdQL7N2wOeB9jnIx7jR5wsuSBEFI8=
@@ -8,7 +6,9 @@ github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2 h1:NwxKRvbkH5MsNkvOtPZi3/3kmI8CAzs3mtv+GLQMkNo=
-golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
+golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
diff --git a/modd.conf b/modd.conf
index f9dc4d4..e541053 100644
--- a/modd.conf
+++ b/modd.conf
@@ -2,8 +2,4 @@
 !vendor/**.go {
     prep: make test
     prep: make bin/keygen
-}
-
-doc/sequence-diagram/*.seq {
-    prep: make sequence-diagram
 }
\ No newline at end of file