diff --git a/README.md b/README.md
index a36c66bf..8c2d4d1f 100644
--- a/README.md
+++ b/README.md
@@ -126,15 +126,15 @@ Look [here](docs/policy.md) for full documentation on Witness Policies.
       "name": "build",
       "attestations": [
         {
-          "type": "https://witness.testifysec.com/attestations/material/v0.1",
+          "type": "https://witness.dev/attestations/material/v0.1",
           "regopolicies": []
         },
         {
-          "type": "https://witness.testifysec.com/attestations/command-run/v0.1",
+          "type": "https://witness.dev/attestations/command-run/v0.1",
           "regopolicies": []
         },
         {
-          "type": "https://witness.testifysec.com/attestations/product/v0.1",
+          "type": "https://witness.dev/attestations/product/v0.1",
           "regopolicies": []
         }
       ],
@@ -187,7 +187,7 @@ Witness attestors are pieces of code that assert facts about a system and store
 
 ```
   Name    = "aws"
-  Type    = "https://witness.testifysec.com/attestation/aws/v0.1"
+  Type    = "https://witness.dev/attestations/aws/v0.1"
   RunType = attestation.PreRunType
 ```
 
diff --git a/dev/build-and-push-builders.sh b/dev/build-and-push-builders.sh
index 4afc6874..7f04fc12 100755
--- a/dev/build-and-push-builders.sh
+++ b/dev/build-and-push-builders.sh
@@ -13,19 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -e
+#set -e
 
 cd ..
 go mod tidy
 go mod vendor
-go build -o ./bin/witness
+make
 cd dev
 
 RED='\033[0;31m'
 
 sha=$(git rev-parse --short HEAD)
 tag=$(git describe --tags $(git rev-list --tags --max-count=1))
-imagetag=`echo registry.gitlab.com/testifysec/witness/builder:${tag}-${sha}-golang-1.17.3`
+imagetag=`echo registry.gitlab.com/testifysec/demos/witness-demo/builder:${tag}-${sha}-golang-1.17.3`
 
 
 docker build -f ./Dockerfile.go-builder -t ${imagetag} ./../
diff --git a/docs/policy.md b/docs/policy.md
index a5167d4c..5701e608 100644
--- a/docs/policy.md
+++ b/docs/policy.md
@@ -150,15 +150,15 @@ deny[msg] {
       "name": "clone",
       "attestations": [
         {
-          "type": "https://witness.testifysec.com/attestations/material/v0.1",
+          "type": "https://witness.dev/attestations/material/v0.1",
           "regopolicies": []
         },
         {
-          "type": "https://witness.testifysec.com/attestations/command-run/v0.1",
+          "type": "https://witness.dev/attestations/command-run/v0.1",
           "regopolicies": []
         },
         {
-          "type": "https://witness.testifysec.com/attestations/product/v0.1",
+          "type": "https://witness.dev/attestations/product/v0.1",
           "regopolicies": []
         }
       ],
@@ -174,11 +174,11 @@ deny[msg] {
       "artifactsFrom": ["clone"],
       "attestations": [
         {
-          "type": "https://witness.testifysec.com/attestations/material/v0.1",
+          "type": "https://witness.dev/attestations/material/v0.1",
           "regopolicies": []
         },
         {
-          "type": "https://witness.testifysec.com/attestations/command-run/v0.1",
+          "type": "https://witness.dev/attestations/command-run/v0.1",
           "regopolicies": [
             {
               "name": "expected command",
@@ -187,7 +187,7 @@ deny[msg] {
           ]
         },
         {
-          "type": "https://witness.testifysec.com/attestations/product/v0.1",
+          "type": "https://witness.dev/attestations/product/v0.1",
           "regopolicies": []
         }
       ],
diff --git a/examples/log4shell/policy.json b/examples/log4shell/policy.json
index ef6feaa8..d3fb3976 100644
--- a/examples/log4shell/policy.json
+++ b/examples/log4shell/policy.json
@@ -5,19 +5,19 @@
             "name": "demo",
             "attestations": [
                 {
-                    "type": "https://witness.testifysec.com/attestations/material/v0.1",
+                    "type": "https://witness.dev/attestations/material/v0.1",
                     "regopolicies": []
                 },
                 {
-                    "type": "https://witness.testifysec.com/attestations/command-run/v0.1",
+                    "type": "https://witness.dev/attestations/command-run/v0.1",
                     "regopolicies": []
                 },
                 {
-                    "type": "https://witness.testifysec.com/attestations/product/v0.1",
+                    "type": "https://witness.dev/attestations/product/v0.1",
                     "regopolicies": []
                 },
                 {
-                    "type": "https://witness.testifysec.com/attestations/maven/v0.1",
+                    "type": "https://witness.dev/attestations/maven/v0.1",
                     "regopolicies": [
                         {
                             "name": "log4j vulnerability",
diff --git a/pkg/attestation/aws-iid/aws-iid.go b/pkg/attestation/aws-iid/aws-iid.go
index 0d61fbb6..4d6ac7ef 100644
--- a/pkg/attestation/aws-iid/aws-iid.go
+++ b/pkg/attestation/aws-iid/aws-iid.go
@@ -33,7 +33,7 @@ import (
 
 const (
 	Name    = "aws"
-	Type    = "https://witness.testifysec.com/attestation/aws/v0.1"
+	Type    = "https://witness.dev/attestations/aws/v0.1"
 	RunType = attestation.PreRunType
 )
 
diff --git a/pkg/attestation/commandrun/commandrun.go b/pkg/attestation/commandrun/commandrun.go
index 18936ea0..ba5d9428 100644
--- a/pkg/attestation/commandrun/commandrun.go
+++ b/pkg/attestation/commandrun/commandrun.go
@@ -26,7 +26,7 @@ import (
 
 const (
 	Name    = "command-run"
-	Type    = "https://witness.testifysec.com/attestations/command-run/v0.1"
+	Type    = "https://witness.dev/attestations/command-run/v0.1"
 	RunType = attestation.Internal
 )
 
diff --git a/pkg/attestation/environment/environment.go b/pkg/attestation/environment/environment.go
index 0e704dde..01dd988d 100644
--- a/pkg/attestation/environment/environment.go
+++ b/pkg/attestation/environment/environment.go
@@ -25,7 +25,7 @@ import (
 
 const (
 	Name    = "environment"
-	Type    = "https://witness.testifysec.com/attestations/environment/v0.1"
+	Type    = "https://witness.dev/attestations/environment/v0.1"
 	RunType = attestation.PreRunType
 )
 
diff --git a/pkg/attestation/gcp-iit/gcp-iit.go b/pkg/attestation/gcp-iit/gcp-iit.go
index 5d685cbc..1e140153 100644
--- a/pkg/attestation/gcp-iit/gcp-iit.go
+++ b/pkg/attestation/gcp-iit/gcp-iit.go
@@ -31,7 +31,7 @@ import (
 
 const (
 	Name    = "gcp-iit"
-	Type    = "https://witness.testifysec.com/attestation/gcp-iit/v0.1"
+	Type    = "https://witness.dev/attestations/gcp-iit/v0.1"
 	RunType = attestation.PreRunType
 
 	jwksUrl = "https://www.googleapis.com/oauth2/v3/certs"
diff --git a/pkg/attestation/git/git.go b/pkg/attestation/git/git.go
index 7a00b0f9..d7533011 100644
--- a/pkg/attestation/git/git.go
+++ b/pkg/attestation/git/git.go
@@ -25,7 +25,7 @@ import (
 
 const (
 	Name    = "git"
-	Type    = "https://witness.testifysec.com/attestations/git/v0.1"
+	Type    = "https://witness.dev/attestations/git/v0.1"
 	RunType = attestation.PreRunType
 )
 
diff --git a/pkg/attestation/gitlab/gitlab.go b/pkg/attestation/gitlab/gitlab.go
index d2c1d41a..c5106010 100644
--- a/pkg/attestation/gitlab/gitlab.go
+++ b/pkg/attestation/gitlab/gitlab.go
@@ -25,7 +25,7 @@ import (
 
 const (
 	Name    = "gitlab"
-	Type    = "https://witness.testifysec.com/attestations/gitlab/v0.1"
+	Type    = "https://witness.dev/attestations/gitlab/v0.1"
 	RunType = attestation.PreRunType
 
 	jwksUrl = "https://gitlab.com/-/jwks"
diff --git a/pkg/attestation/jwt/jwt.go b/pkg/attestation/jwt/jwt.go
index 901be7df..38f3e268 100644
--- a/pkg/attestation/jwt/jwt.go
+++ b/pkg/attestation/jwt/jwt.go
@@ -26,7 +26,7 @@ import (
 
 const (
 	Name    = "jwt"
-	Type    = "https://witness.testifysec.com/attestations/jwt/v0.1"
+	Type    = "https://witness.dev/attestations/jwt/v0.1"
 	RunType = attestation.PreRunType
 )
 
diff --git a/pkg/attestation/material/material.go b/pkg/attestation/material/material.go
index ca885b17..9c2c0eac 100644
--- a/pkg/attestation/material/material.go
+++ b/pkg/attestation/material/material.go
@@ -24,7 +24,7 @@ import (
 
 const (
 	Name    = "material"
-	Type    = "https://witness.testifysec.com/attestations/material/v0.1"
+	Type    = "https://witness.dev/attestations/material/v0.1"
 	RunType = attestation.Internal
 )
 
diff --git a/pkg/attestation/maven/maven.go b/pkg/attestation/maven/maven.go
index f79a16a1..285b2457 100644
--- a/pkg/attestation/maven/maven.go
+++ b/pkg/attestation/maven/maven.go
@@ -26,7 +26,7 @@ import (
 
 const (
 	Name    = "maven"
-	Type    = "https://witness.testifysec.com/attestations/maven/v0.1"
+	Type    = "https://witness.dev/attestations/maven/v0.1"
 	RunType = attestation.PreRunType
 )
 
diff --git a/pkg/attestation/oci/oci.go b/pkg/attestation/oci/oci.go
index 1a19282d..91e29916 100644
--- a/pkg/attestation/oci/oci.go
+++ b/pkg/attestation/oci/oci.go
@@ -33,7 +33,7 @@ import (
 
 const (
 	Name    = "oci"
-	Type    = "https://witness.testifysec.com/attestations/oci/v0.1"
+	Type    = "https://witness.dev/attestations/oci/v0.1"
 	RunType = attestation.PostRunType
 )
 
diff --git a/pkg/attestation/product/product.go b/pkg/attestation/product/product.go
index a1cb70a9..d05ebbcd 100644
--- a/pkg/attestation/product/product.go
+++ b/pkg/attestation/product/product.go
@@ -27,7 +27,7 @@ import (
 
 const (
 	Name    = "product"
-	Type    = "https://witness.testifysec.com/attestations/product/v0.1"
+	Type    = "https://witness.dev/attestations/product/v0.1"
 	RunType = attestation.Internal
 )
 
diff --git a/pkg/attestation/sarif/sarif.go b/pkg/attestation/sarif/sarif.go
index c2d65670..682d17af 100644
--- a/pkg/attestation/sarif/sarif.go
+++ b/pkg/attestation/sarif/sarif.go
@@ -28,7 +28,7 @@ import (
 
 const (
 	Name    = "sarif"
-	Type    = "https://witness.testifysec.com/attestations/sarif/v0.1"
+	Type    = "https://witness.dev/attestations/sarif/v0.1"
 	RunType = attestation.PostRunType
 )
 
diff --git a/pkg/attestation/scorecard/scorecard.go b/pkg/attestation/scorecard/scorecard.go
index 247aef53..fbd12de6 100644
--- a/pkg/attestation/scorecard/scorecard.go
+++ b/pkg/attestation/scorecard/scorecard.go
@@ -28,7 +28,7 @@ import (
 
 const (
 	Name    = "scorecard"
-	Type    = "https://witness.testifysec.com/attestations/scorecard/v0.1"
+	Type    = "https://witness.dev/attestations/scorecard/v0.1"
 	RunType = attestation.PostRunType
 )
 
diff --git a/test/policy.json b/test/policy.json
index 66924696..918c460f 100644
--- a/test/policy.json
+++ b/test/policy.json
@@ -5,11 +5,11 @@
       "name": "build",
       "attestations": [
         {
-          "type": "https://witness.testifysec.com/attestations/material/v0.1",
+          "type": "https://witness.dev/attestations/material/v0.1",
           "regopolicies": []
         },
         {
-          "type": "https://witness.testifysec.com/attestations/command-run/v0.1",
+          "type": "https://witness.dev/attestations/command-run/v0.1",
           "regopolicies": [
             {
               "name": "expected command",
@@ -18,7 +18,7 @@
           ]
         },
         {
-          "type": "https://witness.testifysec.com/attestations/product/v0.1",
+          "type": "https://witness.dev/attestations/product/v0.1",
           "regopolicies": []
         }
       ],