diff --git a/build/Makefile b/build/Makefile
index 093fe2339a..df8f95577f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -57,7 +57,7 @@ KIND_PROFILE ?= agones
 KIND_CONTAINER_NAME=$(KIND_PROFILE)-control-plane
 
 # Game Server image to use while doing end-to-end tests
-GS_TEST_IMAGE ?= gcr.io/agones-images/udp-server:0.15
+GS_TEST_IMAGE ?= gcr.io/agones-images/udp-server:0.17
 
 # Directory that this Makefile is in.
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
diff --git a/examples/cpp-simple/Makefile b/examples/cpp-simple/Makefile
index f62b5bb0df..fbd5c3d6a5 100644
--- a/examples/cpp-simple/Makefile
+++ b/examples/cpp-simple/Makefile
@@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images
 # Directory that this Makefile is in.
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-server_tag = $(REPOSITORY)/cpp-simple-server:0.10
+server_tag = $(REPOSITORY)/cpp-simple-server:0.11
 root_path = $(realpath $(project_path)/../..)
 
 #   _____                    _
diff --git a/examples/cpp-simple/fleet.yaml b/examples/cpp-simple/fleet.yaml
index 5e0bddbe7b..4c03d0033d 100644
--- a/examples/cpp-simple/fleet.yaml
+++ b/examples/cpp-simple/fleet.yaml
@@ -30,5 +30,5 @@ spec:
         spec:
           containers:
             - name: cpp-simple
-              image: gcr.io/agones-images/cpp-simple-server:0.9
+              image: gcr.io/agones-images/cpp-simple-server:0.11
               # imagePullPolicy: Always # add for development
\ No newline at end of file
diff --git a/examples/cpp-simple/gameserver.yaml b/examples/cpp-simple/gameserver.yaml
index aa09608835..0386e783dd 100644
--- a/examples/cpp-simple/gameserver.yaml
+++ b/examples/cpp-simple/gameserver.yaml
@@ -27,5 +27,5 @@ spec:
     spec:
       containers:
       - name: cpp-simple
-        image: gcr.io/agones-images/cpp-simple-server:0.9
+        image: gcr.io/agones-images/cpp-simple-server:0.11
         imagePullPolicy: Always # add for development
\ No newline at end of file
diff --git a/examples/fleet.yaml b/examples/fleet.yaml
index 2bb30f2a4b..3f6958a952 100644
--- a/examples/fleet.yaml
+++ b/examples/fleet.yaml
@@ -74,4 +74,4 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.15
\ No newline at end of file
+            image: gcr.io/agones-images/udp-server:0.17
\ No newline at end of file
diff --git a/examples/gameserver.yaml b/examples/gameserver.yaml
index 6953b21d56..36727e1f7e 100644
--- a/examples/gameserver.yaml
+++ b/examples/gameserver.yaml
@@ -85,5 +85,5 @@ spec:
     spec:
       containers:
       - name: simple-udp
-        image:  gcr.io/agones-images/udp-server:0.15
+        image:  gcr.io/agones-images/udp-server:0.17
         imagePullPolicy: Always
diff --git a/examples/nodejs-simple/Makefile b/examples/nodejs-simple/Makefile
index a223c38d66..cbbf2253ff 100644
--- a/examples/nodejs-simple/Makefile
+++ b/examples/nodejs-simple/Makefile
@@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images
 # Directory that this Makefile is in.
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-server_tag = $(REPOSITORY)/nodejs-simple-server:0.1
+server_tag = $(REPOSITORY)/nodejs-simple-server:0.2
 root_path = $(realpath $(project_path)/../..)
 
 #   _____                    _
diff --git a/examples/nodejs-simple/gameserver.yaml b/examples/nodejs-simple/gameserver.yaml
index 468e71f10a..281f5fa85e 100644
--- a/examples/nodejs-simple/gameserver.yaml
+++ b/examples/nodejs-simple/gameserver.yaml
@@ -27,5 +27,5 @@ spec:
     spec:
       containers:
       - name: nodejs-simple
-        image: gcr.io/agones-images/nodejs-simple-server:0.1
+        image: gcr.io/agones-images/nodejs-simple-server:0.2
         imagePullPolicy: Always
diff --git a/examples/rust-simple/Makefile b/examples/rust-simple/Makefile
index 6d542b5f08..b641beee0d 100644
--- a/examples/rust-simple/Makefile
+++ b/examples/rust-simple/Makefile
@@ -27,7 +27,7 @@ REPOSITORY ?= gcr.io/agones-images
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-server_tag = $(REPOSITORY)/rust-simple-server:0.5
+server_tag = $(REPOSITORY)/rust-simple-server:0.6
 
 #   _____                    _
 #  |_   _|_ _ _ __ __ _  ___| |_ ___
diff --git a/examples/rust-simple/gameserver.yaml b/examples/rust-simple/gameserver.yaml
index 2986392091..fa10438941 100644
--- a/examples/rust-simple/gameserver.yaml
+++ b/examples/rust-simple/gameserver.yaml
@@ -26,5 +26,5 @@ spec:
     spec:
       containers:
       - name: rust-simple
-        image: gcr.io/agones-images/rust-simple-server:0.4
+        image: gcr.io/agones-images/rust-simple-server:0.6
         imagePullPolicy: Always
diff --git a/examples/simple-tcp/Dockerfile b/examples/simple-tcp/Dockerfile
index 1eec89a9a3..8cba04cdc7 100644
--- a/examples/simple-tcp/Dockerfile
+++ b/examples/simple-tcp/Dockerfile
@@ -21,7 +21,7 @@ COPY . /go/src/agones.dev/agones
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server .
 
 # final image
-FROM alpine:3.9
+FROM alpine:3.10
 
 RUN adduser -D server
 COPY --from=builder /go/src/simple-tcp/server /home/server/server
@@ -29,4 +29,4 @@ RUN chown -R server /home/server && \
     chmod o+x /home/server/server
 
 USER server
-ENTRYPOINT ["/home/server/server"]
\ No newline at end of file
+ENTRYPOINT ["/home/server/server"]
diff --git a/examples/simple-tcp/Makefile b/examples/simple-tcp/Makefile
index fa3cc01401..a6cef38360 100644
--- a/examples/simple-tcp/Makefile
+++ b/examples/simple-tcp/Makefile
@@ -27,7 +27,7 @@ REPOSITORY = gcr.io/agones-images
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-server_tag = $(REPOSITORY)/tcp-server:0.1
+server_tag = $(REPOSITORY)/tcp-server:0.3
 root_path = $(realpath $(project_path)/../..)
 
 #   _____                    _
diff --git a/examples/simple-tcp/gameserver.yaml b/examples/simple-tcp/gameserver.yaml
index 772ecfd99d..51b80bd330 100644
--- a/examples/simple-tcp/gameserver.yaml
+++ b/examples/simple-tcp/gameserver.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
       - name: simple-tcp
-        image: gcr.io/agones-images/tcp-server:0.1
+        image: gcr.io/agones-images/tcp-server:0.3
         resources:
           requests:
             memory: "32Mi"
diff --git a/examples/simple-udp/Dockerfile b/examples/simple-udp/Dockerfile
index f676b9698a..ef1567afbf 100644
--- a/examples/simple-udp/Dockerfile
+++ b/examples/simple-udp/Dockerfile
@@ -21,7 +21,7 @@ COPY . /go/src/agones.dev/agones
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server .
 
 # final image
-FROM alpine:3.9
+FROM alpine:3.10
 
 RUN adduser -D server
 COPY --from=builder /go/src/simple-udp/server /home/server/server
@@ -29,4 +29,4 @@ RUN chown -R server /home/server && \
     chmod o+x /home/server/server
 
 USER server
-ENTRYPOINT ["/home/server/server"]
\ No newline at end of file
+ENTRYPOINT ["/home/server/server"]
diff --git a/examples/simple-udp/Makefile b/examples/simple-udp/Makefile
index 68a2360655..762e066dce 100644
--- a/examples/simple-udp/Makefile
+++ b/examples/simple-udp/Makefile
@@ -27,7 +27,7 @@ REPOSITORY = gcr.io/agones-images
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-server_tag = $(REPOSITORY)/udp-server:0.15
+server_tag = $(REPOSITORY)/udp-server:0.17
 root_path = $(realpath $(project_path)/../..)
 
 #   _____                    _
diff --git a/examples/simple-udp/dev-gameserver.yaml b/examples/simple-udp/dev-gameserver.yaml
index 0973904c64..37fd33e43b 100644
--- a/examples/simple-udp/dev-gameserver.yaml
+++ b/examples/simple-udp/dev-gameserver.yaml
@@ -31,4 +31,4 @@ spec:
     spec:
       containers:
       - name: simple-udp
-        image: gcr.io/agones-images/udp-server:0.15
+        image: gcr.io/agones-images/udp-server:0.17
diff --git a/examples/simple-udp/fleet-distributed.yaml b/examples/simple-udp/fleet-distributed.yaml
index d3e176f605..09b03c7ace 100644
--- a/examples/simple-udp/fleet-distributed.yaml
+++ b/examples/simple-udp/fleet-distributed.yaml
@@ -32,7 +32,7 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.15
+            image: gcr.io/agones-images/udp-server:0.17
             resources:
               requests:
                 memory: "32Mi"
diff --git a/examples/simple-udp/fleet.yaml b/examples/simple-udp/fleet.yaml
index 677d039065..56c9a35b0a 100644
--- a/examples/simple-udp/fleet.yaml
+++ b/examples/simple-udp/fleet.yaml
@@ -27,7 +27,7 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.15
+            image: gcr.io/agones-images/udp-server:0.17
             resources:
               requests:
                 memory: "64Mi"
diff --git a/examples/simple-udp/gameserver-passthrough.yaml b/examples/simple-udp/gameserver-passthrough.yaml
index 1f294bc9d8..2c57670dbd 100644
--- a/examples/simple-udp/gameserver-passthrough.yaml
+++ b/examples/simple-udp/gameserver-passthrough.yaml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
       - name: simple-udp
-        image: gcr.io/agones-images/udp-server:0.15
+        image: gcr.io/agones-images/udp-server:0.17
         env:
           - name: "PASSTHROUGH"
             value: "TRUE"
diff --git a/examples/simple-udp/gameserver.yaml b/examples/simple-udp/gameserver.yaml
index 42f5c27f4c..331f18b1a4 100644
--- a/examples/simple-udp/gameserver.yaml
+++ b/examples/simple-udp/gameserver.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: simple-udp
-        image: gcr.io/agones-images/udp-server:0.15
+        image: gcr.io/agones-images/udp-server:0.17
         resources:
           requests:
             memory: "32Mi"
diff --git a/examples/simple-udp/gameserverset.yaml b/examples/simple-udp/gameserverset.yaml
index 9d14cc98eb..2354914357 100644
--- a/examples/simple-udp/gameserverset.yaml
+++ b/examples/simple-udp/gameserverset.yaml
@@ -31,4 +31,4 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.15
\ No newline at end of file
+            image: gcr.io/agones-images/udp-server:0.17
\ No newline at end of file
diff --git a/examples/unity-simple/Makefile b/examples/unity-simple/Makefile
index be8971e3b5..5e7f805832 100644
--- a/examples/unity-simple/Makefile
+++ b/examples/unity-simple/Makefile
@@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-server_tag = $(REPOSITORY)/unity-simple-server:0.2
+server_tag = $(REPOSITORY)/unity-simple-server:0.3
 
 #   _____                    _
 #  |_   _|_ _ _ __ __ _  ___| |_ ___
diff --git a/examples/unity-simple/gameserver.yaml b/examples/unity-simple/gameserver.yaml
index 07dc3e74ca..1cbd12c0b6 100644
--- a/examples/unity-simple/gameserver.yaml
+++ b/examples/unity-simple/gameserver.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
       - name: unity-simple-server
-        image: gcr.io/agones-images/unity-simple-server:0.2
+        image: gcr.io/agones-images/unity-simple-server:0.3
       resources:
         requests:
           memory: "128Mi"
diff --git a/examples/xonotic/Makefile b/examples/xonotic/Makefile
index 375989ab5b..4bdc209858 100644
--- a/examples/xonotic/Makefile
+++ b/examples/xonotic/Makefile
@@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
 root_path := $(realpath $(project_path)/../..)
-image_tag = $(REPOSITORY)/xonotic-example:0.6
+image_tag = $(REPOSITORY)/xonotic-example:0.7
 
 #   _____                    _
 #  |_   _|_ _ _ __ __ _  ___| |_ ___
diff --git a/examples/xonotic/fleet.yaml b/examples/xonotic/fleet.yaml
index 998656678b..7d7ba2dd27 100644
--- a/examples/xonotic/fleet.yaml
+++ b/examples/xonotic/fleet.yaml
@@ -35,4 +35,4 @@ spec:
         spec:
           containers:
           - name: xonotic
-            image: gcr.io/agones-images/xonotic-example:0.6
+            image: gcr.io/agones-images/xonotic-example:0.7
diff --git a/examples/xonotic/gameserver.yaml b/examples/xonotic/gameserver.yaml
index 2a8cdd02f9..318f4276b6 100644
--- a/examples/xonotic/gameserver.yaml
+++ b/examples/xonotic/gameserver.yaml
@@ -24,5 +24,5 @@ spec:
     spec:
       containers:
       - name: xonotic
-        image: gcr.io/agones-images/xonotic-example:0.6
+        image: gcr.io/agones-images/xonotic-example:0.7
         # imagePullPolicy: Always # add for development
diff --git a/pkg/util/webhooks/webhooks_test.go b/pkg/util/webhooks/webhooks_test.go
index bd2e0a0754..6390486d2e 100644
--- a/pkg/util/webhooks/webhooks_test.go
+++ b/pkg/util/webhooks/webhooks_test.go
@@ -164,7 +164,7 @@ func TestWebHookFleetValidationHandler(t *testing.T) {
 							"template": {
 								"spec": {
 									"containers": [{
-										"image": "gcr.io/agones-images/udp-server:0.15",
+										"image": "gcr.io/agones-images/udp-server:0.17",
 										"name": false
 									}]
 								}
diff --git a/site/config.toml b/site/config.toml
index 35903820b6..39f6ec5a5c 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -91,7 +91,7 @@ release_branch = "release-1.0.0"
 release_version = "1.0.0"
 
 # example tag
-example_image_tag = "gcr.io/agones-images/udp-server:0.15"
+example_image_tag = "gcr.io/agones-images/udp-server:0.17"
 
 # User interface configuration
 [params.ui]
diff --git a/site/content/en/docs/Guides/local-game-server.md b/site/content/en/docs/Guides/local-game-server.md
index 696b0b5943..80fe57ef4d 100644
--- a/site/content/en/docs/Guides/local-game-server.md
+++ b/site/content/en/docs/Guides/local-game-server.md
@@ -13,6 +13,7 @@ You can register a local game server with Agones. This means you can run an expe
 
 To register your local game server you'll need to know the IP address of the machine running it and the port. With that you'll create a game server config like the one below.
 
+{{% feature expiryVersion="1.1.0" %}}
 ```yaml
 apiVersion: "agones.dev/v1"
 kind: GameServer
@@ -34,6 +35,30 @@ spec:
       - name: simple-udp
         image: gcr.io/agones-images/udp-server:0.15
 ```
+{{% /feature %}}
+{{% feature publishVersion="1.1.0" %}}
+```yaml
+apiVersion: "agones.dev/v1"
+kind: GameServer
+metadata:
+  name: my-local-server
+  annotations:
+    # Causes Agones to register your local game server at 192.1.1.2, replace with your server's IP address.
+    agones.dev/dev-address: "192.1.1.2"
+spec:
+  ports:
+  - name: default
+    portPolicy: Static
+    hostPort: 17654
+    containerPort: 17654
+  # The following is ignored but required due to validation.
+  template:
+    spec:
+      containers:
+      - name: simple-udp
+        image: gcr.io/agones-images/udp-server:0.17
+```
+{{% /feature %}}
 
 Once you save this to a file make sure you have `kubectl` configured to point to your Agones cluster and then run `kubectl apply -f dev-gameserver.yaml`. This will register your server with Agones.
 
diff --git a/site/content/en/docs/Guides/troubleshooting.md b/site/content/en/docs/Guides/troubleshooting.md
index abc46753ae..3d60366f12 100644
--- a/site/content/en/docs/Guides/troubleshooting.md
+++ b/site/content/en/docs/Guides/troubleshooting.md
@@ -51,7 +51,7 @@ Spec:
       Creation Timestamp:  <nil>
     Spec:
       Containers:
-        Image:  gcr.io/agones-images/udp-server:0.15
+        Image:  gcr.io/agones-images/udp-server:0.17
         Name:   simple-udp
         Resources:
           Limits:
@@ -82,7 +82,7 @@ Events:
 The backing Pod has the same name as the `GameServer` - so it's also worth looking at the
 details and events for the Pod to see if there are any issues there, such as restarts due to binary crashes etc.
 
-For example, you can see the restart count on the gcr.io/agones-images/udp-server:0.15 container
+For example, you can see the restart count on the gcr.io/agones-images/udp-server:0.17 container
 is set to `1`, due to the game server binary crash
 
 ```
@@ -104,7 +104,7 @@ Controlled By:      GameServer/simple-udp-zqppv
 Containers:
   simple-udp:
     Container ID:   docker://69eacd03cc89b0636b78abe47926b02183ba84d18fa20649ca443f5232511661
-    Image:          gcr.io/agones-images/udp-server:0.15
+    Image:          gcr.io/agones-images/udp-server:0.17
     Image ID:       docker-pullable://gcr.io/agones-images/udp-server@sha256:6a60eff5e68b88b5ce75ae98082d79cff36cda411a090f3495760e5c3b6c3575
     Port:           7654/UDP
     Host Port:      7058/UDP
@@ -173,7 +173,7 @@ Events:
   Normal  Created    2m28s                 kubelet, gke-test-cluster-default-590db5e4-4s6r  Created container
   Normal  Created    114s (x2 over 2m31s)  kubelet, gke-test-cluster-default-590db5e4-4s6r  Created container
   Normal  Started    114s (x2 over 2m31s)  kubelet, gke-test-cluster-default-590db5e4-4s6r  Started container
-  Normal  Pulled     114s (x2 over 2m31s)  kubelet, gke-test-cluster-default-590db5e4-4s6r  Container image "gcr.io/agones-images/udp-server:0.15" already present on machine
+  Normal  Pulled     114s (x2 over 2m31s)  kubelet, gke-test-cluster-default-590db5e4-4s6r  Container image "gcr.io/agones-images/udp-server:0.17" already present on machine
 ```
 
 Finally, you can also get the logs of your `GameServer` `Pod` as well via `kubectl logs <pod name> -c <game server container name>`, for example:
diff --git a/site/content/en/docs/Reference/fleet.md b/site/content/en/docs/Reference/fleet.md
index e9e018fe61..949849352e 100644
--- a/site/content/en/docs/Reference/fleet.md
+++ b/site/content/en/docs/Reference/fleet.md
@@ -122,7 +122,7 @@ spec:
         spec:
           containers:
           - name: simple-udp
-            image: gcr.io/agones-images/udp-server:0.15
+            image: gcr.io/agones-images/udp-server:0.17
 ```
 {{% /feature %}}
 
diff --git a/site/content/en/docs/Reference/gameserver.md b/site/content/en/docs/Reference/gameserver.md
index c97e03eb97..f274a23a51 100644
--- a/site/content/en/docs/Reference/gameserver.md
+++ b/site/content/en/docs/Reference/gameserver.md
@@ -131,7 +131,7 @@ spec:
     spec:
       containers:
       - name: simple-udp
-        image:  gcr.io/agones-images/udp-server:0.15
+        image:  gcr.io/agones-images/udp-server:0.17
         imagePullPolicy: Always
 ```
 {{% /feature %}}
diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go
index 55d898c4e8..73504dd719 100644
--- a/test/e2e/main_test.go
+++ b/test/e2e/main_test.go
@@ -34,8 +34,8 @@ func TestMain(m *testing.M) {
 	usr, _ := user.Current()
 	kubeconfig := flag.String("kubeconfig", filepath.Join(usr.HomeDir, "/.kube/config"),
 		"kube config path, e.g. $HOME/.kube/config")
-	gsimage := flag.String("gameserver-image", "gcr.io/agones-images/udp-server:0.15",
-		"gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.15")
+	gsimage := flag.String("gameserver-image", "gcr.io/agones-images/udp-server:0.17",
+		"gameserver image to use for those tests, gcr.io/agones-images/udp-server:0.17")
 	pullSecret := flag.String("pullsecret", "",
 		"optional secret to be used for pulling the gameserver and/or Agones SDK sidecar images")
 	stressTestLevel := flag.Int("stress", 0, "enable stress test at given level 0-100")