diff --git a/Tiltfile b/Tiltfile
index 03f7ff9..fb2e613 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -1,48 +1,48 @@
 # -*- mode: Python -*-
-update_settings(suppress_unused_image_warnings=["lreimer/micronaut-beer-grpc", "lreimer/quarkus-beer-grpc"])
+update_settings(suppress_unused_image_warnings=["qaware/micronaut-beer-grpc", "qaware/quarkus-beer-grpc"])
 
 # for the Quarkus beer services
-# local_resource('quarkus-beer-grpc-build', './gradlew assemble', dir='quarkus-beer-grpc',
-#   deps=['./quarkus-beer-grpc/build.gradle', './quarkus-beer-grpc/src/'], labels=['Quarkus'])
+local_resource('quarkus-beer-grpc-build', './gradlew assemble', dir='quarkus-beer-grpc',
+  deps=['./quarkus-beer-grpc/build.gradle', './quarkus-beer-grpc/src/'], labels=['Quarkus'])
 
-# docker_build('lreimer/quarkus-beer-grpc', './quarkus-beer-grpc/', 
-#   dockerfile='quarkus-beer-grpc/src/main/docker/Dockerfile.jvm', only=['./build/'])
+docker_build('qaware/quarkus-beer-grpc', './quarkus-beer-grpc/',
+  dockerfile='quarkus-beer-grpc/src/main/docker/Dockerfile.jvm', only=['./build/'])
 
-# k8s_yaml(['quarkus-beer-grpc/k8s/deployment.yaml', 'quarkus-beer-grpc/k8s/service.yaml'])
-# k8s_resource(workload='grpc-beer-service', port_forwards=[port_forward(19090, 9090, 'gRPC API')], labels=['Quarkus'])
+k8s_yaml(['quarkus-beer-grpc/k8s/deployment.yaml', 'quarkus-beer-grpc/k8s/service.yaml'])
+k8s_resource(workload='grpc-beer-service', port_forwards=[port_forward(19090, 9090, 'gRPC API')], labels=['Quarkus'])
 
-# local_resource('quarkus-beer-rest-build', './gradlew assemble', dir='quarkus-beer-rest',
-#   deps=['./quarkus-beer-rest/build.gradle', './quarkus-beer-rest/src/'], labels=['Quarkus'])
+local_resource('quarkus-beer-rest-build', './gradlew assemble', dir='quarkus-beer-rest',
+  deps=['./quarkus-beer-rest/build.gradle', './quarkus-beer-rest/src/'], labels=['Quarkus'])
 
-# docker_build('lreimer/quarkus-beer-rest', './quarkus-beer-rest/', 
-#   dockerfile='quarkus-beer-rest/src/main/docker/Dockerfile.jvm', only=['./build/'])
+docker_build('qaware/quarkus-beer-rest', './quarkus-beer-rest/',
+  dockerfile='quarkus-beer-rest/src/main/docker/Dockerfile.jvm', only=['./build/'])
 
-# k8s_yaml(['quarkus-beer-rest/k8s/deployment.yaml', 'quarkus-beer-rest/k8s/service.yaml'])
-# k8s_resource(workload='rest-beer-service', port_forwards=[port_forward(18080, 8080, 'REST API')], labels=['Quarkus'])
+k8s_yaml(['quarkus-beer-rest/k8s/deployment.yaml', 'quarkus-beer-rest/k8s/service.yaml'])
+k8s_resource(workload='rest-beer-service', port_forwards=[port_forward(18080, 8080, 'REST API')], labels=['Quarkus'])
 
 # for the Micronaut beer service
-custom_build('lreimer/micronaut-beer-grpc', 'cd micronaut-beer-grpc && ./gradlew jibDockerBuild --image $EXPECTED_REF', 
-  ['./micronaut-beer-grpc/build.gradle', './micronaut-beer-grpc/src/'])
-k8s_yaml(['micronaut-beer-grpc/k8s/deployment.yaml', 'micronaut-beer-grpc/k8s/service.yaml'])
-k8s_resource(workload='grpc-beer-service', port_forwards=[port_forward(19090, 9090, 'gRPC API')], labels=['Micronaut'])
-
-custom_build('lreimer/micronaut-beer-rest', 'cd micronaut-beer-rest && ./gradlew jibDockerBuild --image $EXPECTED_REF', 
-  ['./micronaut-beer-rest/build.gradle', './micronaut-beer-rest/src/'])
-k8s_yaml(['micronaut-beer-rest/k8s/deployment.yaml', 'micronaut-beer-rest/k8s/service.yaml'])
-k8s_resource(workload='rest-beer-service', port_forwards=[port_forward(18080, 8080, 'REST API')], labels=['Micronaut'])
+# custom_build('qaware/micronaut-beer-grpc', 'cd micronaut-beer-grpc && ./gradlew jibDockerBuild --image $EXPECTED_REF',
+#   ['./micronaut-beer-grpc/build.gradle', './micronaut-beer-grpc/src/'])
+# k8s_yaml(['micronaut-beer-grpc/k8s/deployment.yaml', 'micronaut-beer-grpc/k8s/service.yaml'])
+# k8s_resource(workload='grpc-beer-service', port_forwards=[port_forward(19090, 9090, 'gRPC API')], labels=['Micronaut'])
+#
+# custom_build('qaware/micronaut-beer-rest', 'cd micronaut-beer-rest && ./gradlew jibDockerBuild --image $EXPECTED_REF',
+#   ['./micronaut-beer-rest/build.gradle', './micronaut-beer-rest/src/'])
+# k8s_yaml(['micronaut-beer-rest/k8s/deployment.yaml', 'micronaut-beer-rest/k8s/service.yaml'])
+# k8s_resource(workload='rest-beer-service', port_forwards=[port_forward(18080, 8080, 'REST API')], labels=['Micronaut'])
 
 # the gRPC beer Gateway
-docker_build('lreimer/grpc-beer-gateway', './grpc-beer-gateway/', dockerfile='grpc-beer-gateway/Dockerfile')
+docker_build('qaware/grpc-beer-gateway', './grpc-beer-gateway/', dockerfile='grpc-beer-gateway/Dockerfile')
 k8s_yaml(['grpc-beer-gateway/k8s/deployment.yaml', 'grpc-beer-gateway/k8s/service.yaml'])
 k8s_resource(workload='grpc-beer-gateway', port_forwards=[port_forward(18090, 8090, 'REST API')], labels=['gRPC'])
 
 # the gRPC beer Envoy
-docker_build('lreimer/grpc-beer-envoy', './grpc-beer-envoy/', dockerfile='grpc-beer-envoy/Dockerfile')
+docker_build('qaware/grpc-beer-envoy', './grpc-beer-envoy/', dockerfile='grpc-beer-envoy/Dockerfile')
 k8s_yaml(['grpc-beer-envoy/k8s/deployment.yaml', 'grpc-beer-envoy/k8s/service.yaml'])
 k8s_resource(workload='grpc-beer-envoy', port_forwards=[port_forward(18091, 8091, 'gRPC Web')], labels=['gRPC'])
 
 # the gRPC beer Nginx
-docker_build('lreimer/grpc-beer-nginx', './grpc-beer-nginx/', dockerfile='grpc-beer-nginx/Dockerfile')
+docker_build('qaware/grpc-beer-nginx', './grpc-beer-nginx/', dockerfile='grpc-beer-nginx/Dockerfile')
 k8s_yaml(['grpc-beer-nginx/k8s/deployment.yaml', 'grpc-beer-nginx/k8s/service.yaml'])
 k8s_resource(workload='grpc-beer-nginx', port_forwards=[port_forward(18888, 8888, 'gRPC Proxy')], labels=['gRPC'])
 
diff --git a/grpc-beer-client/Makefile b/grpc-beer-client/Makefile
index 6739e44..d315e68 100644
--- a/grpc-beer-client/Makefile
+++ b/grpc-beer-client/Makefile
@@ -3,7 +3,7 @@ NAME = grpc-beer-client
 default: build
 
 image:
-	@docker build -t lreimer/$(NAME) .
+	@docker build -t qaware/$(NAME) .
 
 build:
 	@buf generate
diff --git a/grpc-beer-client/buf.yaml b/grpc-beer-client/buf.yaml
index c4d9275..191f6e8 100644
--- a/grpc-beer-client/buf.yaml
+++ b/grpc-beer-client/buf.yaml
@@ -1,5 +1,5 @@
 version: v1beta1
-name: github.com/lreimer/from-rest-to-grpc
+name: github.com/qaware/from-rest-to-grpc
 deps:
   - buf.build/beta/googleapis
 build:
diff --git a/grpc-beer-client/go.mod b/grpc-beer-client/go.mod
index ea7a05e..582e518 100644
--- a/grpc-beer-client/go.mod
+++ b/grpc-beer-client/go.mod
@@ -1,4 +1,4 @@
-module github.com/lreimer/from-rest-to-grpc/grpc-beer-client
+module github.com/qaware/from-rest-to-grpc/grpc-beer-client
 
 go 1.17
 
diff --git a/grpc-beer-client/k8s/cronjob.yaml b/grpc-beer-client/k8s/cronjob.yaml
index c4261fd..2ca73ac 100644
--- a/grpc-beer-client/k8s/cronjob.yaml
+++ b/grpc-beer-client/k8s/cronjob.yaml
@@ -10,7 +10,7 @@ spec:
         spec:
           containers:
           - name: grpc-beer-client
-            image: lreimer/grpc-beer-client
+            image: qaware/grpc-beer-client
             resources:
               requests:
                 memory: "64Mi"
diff --git a/grpc-beer-client/main.go b/grpc-beer-client/main.go
index 13a4c0f..7a12243 100644
--- a/grpc-beer-client/main.go
+++ b/grpc-beer-client/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	pb "github.com/lreimer/from-rest-to-grpc/grpc-beer-client/proto"
+	pb "github.com/qaware/from-rest-to-grpc/grpc-beer-client/proto"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
diff --git a/grpc-beer-client/proto/beer.proto b/grpc-beer-client/proto/beer.proto
index 136e269..e3d55f6 100644
--- a/grpc-beer-client/proto/beer.proto
+++ b/grpc-beer-client/proto/beer.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = "github.com/lreimer/from-rest-to-grpc/grpc-beer-client/proto";
+option go_package = "github.com/qaware/from-rest-to-grpc/grpc-beer-client/proto";
 
 import "google/protobuf/empty.proto";
 package beer;
diff --git a/grpc-beer-envoy/Makefile b/grpc-beer-envoy/Makefile
index d9e7cb4..cc23df1 100644
--- a/grpc-beer-envoy/Makefile
+++ b/grpc-beer-envoy/Makefile
@@ -3,4 +3,4 @@ NAME = grpc-beer-envoy
 default: image
 
 image:
-	@docker build -t lreimer/$(NAME) .
+	@docker build -t qaware/$(NAME) .
diff --git a/grpc-beer-envoy/k8s/deployment.yaml b/grpc-beer-envoy/k8s/deployment.yaml
index 83f8e13..b3a7276 100644
--- a/grpc-beer-envoy/k8s/deployment.yaml
+++ b/grpc-beer-envoy/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: grpc-beer-envoy
-        image: lreimer/grpc-beer-envoy
+        image: qaware/grpc-beer-envoy
         resources:
           requests:
             memory: "64Mi"
diff --git a/grpc-beer-gateway/Makefile b/grpc-beer-gateway/Makefile
index d110227..deb6c2b 100644
--- a/grpc-beer-gateway/Makefile
+++ b/grpc-beer-gateway/Makefile
@@ -1,13 +1,36 @@
 NAME = grpc-beer-gateway
 
+# This requires Bash version >= 4
+SHELL:= /usr/bin/env bash -O globstar
+# This will work with legacy versions of Bash without globstar
+# SHELL:= /usr/bin/env bash
+
 default: build
 
+.PHONY: image
 image:
-	@docker build -t lreimer/$(NAME) .
+	docker build -t $(NAME) .
+
+.PHONY: build
+build: $(NAME)
+
+$(NAME): proto/beer.pb.go
+	go build 
+
+proto/beer.pb.go:
+	buf generate
 
-build:
-	@buf generate
-	@go build 
+.PHONY: install-grpc-gateway
+install-grpc-gateway:
+	go install \                                                                                                                                                                                 main !12 ?3
+		github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway \
+		github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2 \
+		google.golang.org/protobuf/cmd/protoc-gen-go \
+		google.golang.org/grpc/cmd/protoc-gen-go-grpc
 
+.PHONY: clean
 clean:
-	@rm -f $(NAME)
\ No newline at end of file
+	rm -f proto/**/*.pb.go
+	rm -f proto/**/*.pb.gw.go
+	rm -rf openapiv2
+	rm -f $(NAME)
\ No newline at end of file
diff --git a/grpc-beer-gateway/buf.yaml b/grpc-beer-gateway/buf.yaml
index fd88cee..ba2e0d7 100644
--- a/grpc-beer-gateway/buf.yaml
+++ b/grpc-beer-gateway/buf.yaml
@@ -1,5 +1,5 @@
 version: v1beta1
-name: github.com/lreimer/from-rest-to-grpc
+name: github.com/qaware/from-rest-to-grpc
 deps:
   - buf.build/beta/googleapis
   - buf.build/grpc-ecosystem/grpc-gateway
diff --git a/grpc-beer-gateway/go.mod b/grpc-beer-gateway/go.mod
index 4d5c1e7..2fa216d 100644
--- a/grpc-beer-gateway/go.mod
+++ b/grpc-beer-gateway/go.mod
@@ -1,4 +1,4 @@
-module github.com/lreimer/from-rest-to-grpc/grpc-beer-gateway
+module github.com/qaware/from-rest-to-grpc/grpc-beer-gateway
 
 go 1.17
 
diff --git a/grpc-beer-gateway/k8s/deployment.yaml b/grpc-beer-gateway/k8s/deployment.yaml
index 8099e2d..f4b28e4 100644
--- a/grpc-beer-gateway/k8s/deployment.yaml
+++ b/grpc-beer-gateway/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: grpc-beer-gateway
-        image: lreimer/grpc-beer-gateway
+        image: qaware/grpc-beer-gateway
         resources:
           requests:
             memory: "64Mi"
diff --git a/grpc-beer-gateway/main.go b/grpc-beer-gateway/main.go
index a4c19ce..5c55d83 100644
--- a/grpc-beer-gateway/main.go
+++ b/grpc-beer-gateway/main.go
@@ -9,7 +9,7 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"google.golang.org/grpc"
 
-	gw "github.com/lreimer/from-rest-to-grpc/grpc-beer-gateway/proto"
+	gw "github.com/qaware/from-rest-to-grpc/grpc-beer-gateway/proto"
 )
 
 func main() {
diff --git a/grpc-beer-gateway/openapiv2/beer.swagger.json b/grpc-beer-gateway/openapiv2/beer.swagger.json
index a494c99..279a8ac 100644
--- a/grpc-beer-gateway/openapiv2/beer.swagger.json
+++ b/grpc-beer-gateway/openapiv2/beer.swagger.json
@@ -10,7 +10,7 @@
     },
     "license": {
       "name": "MIT",
-      "url": "https://github.com/lreimer/from-rest-to-grpc/blob/master/LICENSE"
+      "url": "https://github.com/qaware/from-rest-to-grpc/blob/master/LICENSE"
     }
   },
   "tags": [
@@ -275,6 +275,6 @@
   },
   "externalDocs": {
     "description": "Beer Service gRPC Gateway",
-    "url": "https://github.com/lreimer/from-rest-to-grpc/grpc-beer-gateway"
+    "url": "https://github.com/qaware/from-rest-to-grpc/grpc-beer-gateway"
   }
 }
diff --git a/grpc-beer-gateway/proto/beer.proto b/grpc-beer-gateway/proto/beer.proto
index c625fd0..5904816 100644
--- a/grpc-beer-gateway/proto/beer.proto
+++ b/grpc-beer-gateway/proto/beer.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = "github.com/lreimer/from-rest-to-grpc/grpc-beer-gateway/proto";
+option go_package = "github.com/qaware/from-rest-to-grpc/grpc-beer-gateway/proto";
 
 import "google/protobuf/empty.proto";
 import "google/api/annotations.proto";
@@ -55,11 +55,11 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
 		};
 		license: {
 			name: "MIT";
-			url: "https://github.com/lreimer/from-rest-to-grpc/blob/master/LICENSE";
+			url: "https://github.com/qaware/from-rest-to-grpc/blob/master/LICENSE";
 		};		
 	};
 	external_docs: {
-		url: "https://github.com/lreimer/from-rest-to-grpc/grpc-beer-gateway";
+		url: "https://github.com/qaware/from-rest-to-grpc/grpc-beer-gateway";
 		description: "Beer Service gRPC Gateway";
 	}
 	schemes: HTTP;
diff --git a/grpc-beer-javascript/buf.yaml b/grpc-beer-javascript/buf.yaml
index c4d9275..191f6e8 100644
--- a/grpc-beer-javascript/buf.yaml
+++ b/grpc-beer-javascript/buf.yaml
@@ -1,5 +1,5 @@
 version: v1beta1
-name: github.com/lreimer/from-rest-to-grpc
+name: github.com/qaware/from-rest-to-grpc
 deps:
   - buf.build/beta/googleapis
 build:
diff --git a/grpc-beer-javascript/package.json b/grpc-beer-javascript/package.json
index 9883be0..e71c8ae 100644
--- a/grpc-beer-javascript/package.json
+++ b/grpc-beer-javascript/package.json
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/lreimer/from-rest-to-grpc.git"
+    "url": "git+https://github.com/qaware/from-rest-to-grpc.git"
   },
   "keywords": [
     "grpc-web"
@@ -16,9 +16,9 @@
   "author": "M.-Leander Reimer",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/lreimer/from-rest-to-grpc/issues"
+    "url": "https://github.com/qaware/from-rest-to-grpc/issues"
   },
-  "homepage": "https://github.com/lreimer/from-rest-to-grpc",
+  "homepage": "https://github.com/qaware/from-rest-to-grpc",
   "dependencies": {
     "google-protobuf": "^3.20.1",
     "grpc-web": "^1.3.0"
diff --git a/grpc-beer-javascript/proto/beer.proto b/grpc-beer-javascript/proto/beer.proto
index 9234f8f..3d83030 100644
--- a/grpc-beer-javascript/proto/beer.proto
+++ b/grpc-beer-javascript/proto/beer.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = "github.com/lreimer/from-rest-to-grpc/grpc-beer-service/proto";
+option go_package = "github.com/qaware/from-rest-to-grpc/grpc-beer-service/proto";
 
 import "google/protobuf/empty.proto";
 package beer;
diff --git a/grpc-beer-nginx/k8s/deployment.yaml b/grpc-beer-nginx/k8s/deployment.yaml
index 70e4946..1482cab 100644
--- a/grpc-beer-nginx/k8s/deployment.yaml
+++ b/grpc-beer-nginx/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: grpc-beer-nginx
-        image: lreimer/grpc-beer-nginx
+        image: qaware/grpc-beer-nginx
         resources:
           requests:
             memory: "32Mi"
diff --git a/grpc-beer-service/Makefile b/grpc-beer-service/Makefile
index 5df82cd..2c390f2 100644
--- a/grpc-beer-service/Makefile
+++ b/grpc-beer-service/Makefile
@@ -2,12 +2,24 @@ NAME = grpc-beer-service
 
 default: build
 
+.PHONY: run
+run:
+	HOST=127.0.0.1 PORT=9090 ./grpc-beer-service
+
+.PHONY: image
 image:
-	@docker build -t lreimer/$(NAME) .
+	docker build -t qaware/$(NAME) .
+
+.PHONY: build
+build: grpc-beer-service
+
+grpc-beer-service: proto/beer.pb.go
+	go build
 
-build:
-	@buf generate
-	@go build 
+proto/beer.pb.go:
+	buf generate
 
+.PHONY: clean
 clean:
-	@rm -f $(NAME)
\ No newline at end of file
+	rm proto/*.pb.go
+	rm -f $(NAME)
\ No newline at end of file
diff --git a/grpc-beer-service/beer.go b/grpc-beer-service/beer.go
index 46333ab..0841452 100644
--- a/grpc-beer-service/beer.go
+++ b/grpc-beer-service/beer.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	pb "github.com/lreimer/from-rest-to-grpc/grpc-beer-service/proto"
+	pb "github.com/qaware/from-rest-to-grpc/grpc-beer-service/proto"
 )
 
 var beers = map[string]*pb.Beer{
diff --git a/grpc-beer-service/buf.yaml b/grpc-beer-service/buf.yaml
index c4d9275..191f6e8 100644
--- a/grpc-beer-service/buf.yaml
+++ b/grpc-beer-service/buf.yaml
@@ -1,5 +1,5 @@
 version: v1beta1
-name: github.com/lreimer/from-rest-to-grpc
+name: github.com/qaware/from-rest-to-grpc
 deps:
   - buf.build/beta/googleapis
 build:
diff --git a/grpc-beer-service/go.mod b/grpc-beer-service/go.mod
index 0e0861b..7ff3c5b 100644
--- a/grpc-beer-service/go.mod
+++ b/grpc-beer-service/go.mod
@@ -1,4 +1,4 @@
-module github.com/lreimer/from-rest-to-grpc/grpc-beer-service
+module github.com/qaware/from-rest-to-grpc/grpc-beer-service
 
 go 1.17
 
diff --git a/grpc-beer-service/k8s/deployment.yaml b/grpc-beer-service/k8s/deployment.yaml
index 8ef17d0..ab2f7d3 100644
--- a/grpc-beer-service/k8s/deployment.yaml
+++ b/grpc-beer-service/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: grpc-beer-service
-        image: lreimer/grpc-beer-service
+        image: qaware/grpc-beer-service
         resources:
           requests:
             memory: "64Mi"
diff --git a/grpc-beer-service/main.go b/grpc-beer-service/main.go
index 5652c8f..b3fba2c 100644
--- a/grpc-beer-service/main.go
+++ b/grpc-beer-service/main.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"os"
 
-	pb "github.com/lreimer/from-rest-to-grpc/grpc-beer-service/proto"
+	pb "github.com/qaware/from-rest-to-grpc/grpc-beer-service/proto"
 	"google.golang.org/grpc"
 )
 
diff --git a/grpc-beer-service/proto/beer.proto b/grpc-beer-service/proto/beer.proto
index 9234f8f..3d83030 100644
--- a/grpc-beer-service/proto/beer.proto
+++ b/grpc-beer-service/proto/beer.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = "github.com/lreimer/from-rest-to-grpc/grpc-beer-service/proto";
+option go_package = "github.com/qaware/from-rest-to-grpc/grpc-beer-service/proto";
 
 import "google/protobuf/empty.proto";
 package beer;
diff --git a/grpc-beer-service/server.go b/grpc-beer-service/server.go
index fc17b1e..cff0e07 100644
--- a/grpc-beer-service/server.go
+++ b/grpc-beer-service/server.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"log"
 
-	pb "github.com/lreimer/from-rest-to-grpc/grpc-beer-service/proto"
+	pb "github.com/qaware/from-rest-to-grpc/grpc-beer-service/proto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
diff --git a/micronaut-beer-grpc/build.gradle b/micronaut-beer-grpc/build.gradle
index 0e2b9b9..b09eb94 100644
--- a/micronaut-beer-grpc/build.gradle
+++ b/micronaut-beer-grpc/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
     id("io.micronaut.application") version "3.3.2"
     id("com.google.protobuf") version "0.8.15"
-    id("com.google.cloud.tools.jib") version "2.8.0"
+    id("com.google.cloud.tools.jib") version "3.2.0"
 }
 
 version = "1.0.0"
@@ -32,13 +32,13 @@ application {
     mainClass.set("hands.on.grpc.Application")
 }
 java {
-    sourceCompatibility = JavaVersion.toVersion("11")
-    targetCompatibility = JavaVersion.toVersion("11")
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 tasks {
     jib {
         to {
-            image = "lreimer/micronaut-beer-grpc"
+            image = "qaware/micronaut-beer-grpc"
         }
     }
 }
diff --git a/micronaut-beer-grpc/gradle/wrapper/gradle-wrapper.properties b/micronaut-beer-grpc/gradle/wrapper/gradle-wrapper.properties
index aa991fc..8049c68 100644
--- a/micronaut-beer-grpc/gradle/wrapper/gradle-wrapper.properties
+++ b/micronaut-beer-grpc/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/micronaut-beer-grpc/k8s/deployment.yaml b/micronaut-beer-grpc/k8s/deployment.yaml
index 0444134..0a7407a 100644
--- a/micronaut-beer-grpc/k8s/deployment.yaml
+++ b/micronaut-beer-grpc/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: grpc-beer-service
-        image: lreimer/micronaut-beer-grpc
+        image: qaware/micronaut-beer-grpc
         resources:
           requests:
             memory: "128Mi"
diff --git a/micronaut-beer-rest/build.gradle b/micronaut-beer-rest/build.gradle
index 0954e0b..86f6959 100644
--- a/micronaut-beer-rest/build.gradle
+++ b/micronaut-beer-rest/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
     id("io.micronaut.application") version "3.3.2"
     id("com.google.protobuf") version "0.8.15"
-    id("com.google.cloud.tools.jib") version "2.8.0"
+    id("com.google.cloud.tools.jib") version "3.2.0"
 }
 
 version = "1.0.0"
@@ -31,14 +31,14 @@ application {
     mainClass.set("hands.on.grpc.Application")
 }
 java {
-    sourceCompatibility = JavaVersion.toVersion("11")
-    targetCompatibility = JavaVersion.toVersion("11")
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks {
     jib {
         to {
-            image = "lreimer/micronaut-beer-rest"
+            image = "qaware/micronaut-beer-rest"
         }
     }
 }
diff --git a/micronaut-beer-rest/gradle/wrapper/gradle-wrapper.properties b/micronaut-beer-rest/gradle/wrapper/gradle-wrapper.properties
index aa991fc..8049c68 100644
--- a/micronaut-beer-rest/gradle/wrapper/gradle-wrapper.properties
+++ b/micronaut-beer-rest/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/micronaut-beer-rest/k8s/deployment.yaml b/micronaut-beer-rest/k8s/deployment.yaml
index d673c7f..974a93f 100644
--- a/micronaut-beer-rest/k8s/deployment.yaml
+++ b/micronaut-beer-rest/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: rest-beer-service
-        image: lreimer/micronaut-beer-rest
+        image: qaware/micronaut-beer-rest
         resources:
           requests:
             memory: "128Mi"
diff --git a/quarkus-beer-grpc/build.gradle b/quarkus-beer-grpc/build.gradle
index 4d7f9f6..5eed150 100644
--- a/quarkus-beer-grpc/build.gradle
+++ b/quarkus-beer-grpc/build.gradle
@@ -23,8 +23,8 @@ group 'hands.on.grpc'
 version '1.0.0-SNAPSHOT'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileJava {
diff --git a/quarkus-beer-grpc/gradle.properties b/quarkus-beer-grpc/gradle.properties
index d51f8cc..cea8720 100644
--- a/quarkus-beer-grpc/gradle.properties
+++ b/quarkus-beer-grpc/gradle.properties
@@ -1,6 +1,6 @@
 #Gradle properties
 quarkusPluginId=io.quarkus
-quarkusPluginVersion=2.7.4.Final
+quarkusPluginVersion=2.11.1.Final
 quarkusPlatformGroupId=io.quarkus.platform
 quarkusPlatformArtifactId=quarkus-bom
-quarkusPlatformVersion=2.7.4.Final
\ No newline at end of file
+quarkusPlatformVersion=2.11.1.Final
\ No newline at end of file
diff --git a/quarkus-beer-grpc/k8s/deployment.yaml b/quarkus-beer-grpc/k8s/deployment.yaml
index 59e83d5..4ca4116 100644
--- a/quarkus-beer-grpc/k8s/deployment.yaml
+++ b/quarkus-beer-grpc/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: grpc-beer-service
-        image: lreimer/quarkus-beer-grpc
+        image: qaware/quarkus-beer-grpc
         resources:
           requests:
             memory: "128Mi"
diff --git a/quarkus-beer-grpc/src/main/docker/Dockerfile.jvm b/quarkus-beer-grpc/src/main/docker/Dockerfile.jvm
index ce8d52e..98c8d50 100644
--- a/quarkus-beer-grpc/src/main/docker/Dockerfile.jvm
+++ b/quarkus-beer-grpc/src/main/docker/Dockerfile.jvm
@@ -75,7 +75,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.14
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
 
diff --git a/quarkus-beer-grpc/src/main/docker/Dockerfile.legacy-jar b/quarkus-beer-grpc/src/main/docker/Dockerfile.legacy-jar
index f500dc2..a971952 100644
--- a/quarkus-beer-grpc/src/main/docker/Dockerfile.legacy-jar
+++ b/quarkus-beer-grpc/src/main/docker/Dockerfile.legacy-jar
@@ -75,7 +75,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.14
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
 
diff --git a/quarkus-beer-grpc/src/main/java/hands/on/grpc/HelloResource.java b/quarkus-beer-grpc/src/main/java/hands/on/grpc/HelloResource.java
index 4cbcaf3..ea3cbc4 100644
--- a/quarkus-beer-grpc/src/main/java/hands/on/grpc/HelloResource.java
+++ b/quarkus-beer-grpc/src/main/java/hands/on/grpc/HelloResource.java
@@ -11,7 +11,8 @@
 @Path("/hello")
 public class HelloResource {
 
-    @GrpcClient("greeter")
+    //@GrpcClient("greeter")
+    @GrpcClient
     HelloGrpcGrpc.HelloGrpcBlockingStub stub;
 
     @GET
diff --git a/quarkus-beer-rest/build.gradle b/quarkus-beer-rest/build.gradle
index 347aa6c..40f55df 100644
--- a/quarkus-beer-rest/build.gradle
+++ b/quarkus-beer-rest/build.gradle
@@ -30,8 +30,8 @@ group 'hands.on.grpc'
 version '1.0.0-SNAPSHOT'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileJava {
diff --git a/quarkus-beer-rest/gradle.properties b/quarkus-beer-rest/gradle.properties
index d51f8cc..cea8720 100644
--- a/quarkus-beer-rest/gradle.properties
+++ b/quarkus-beer-rest/gradle.properties
@@ -1,6 +1,6 @@
 #Gradle properties
 quarkusPluginId=io.quarkus
-quarkusPluginVersion=2.7.4.Final
+quarkusPluginVersion=2.11.1.Final
 quarkusPlatformGroupId=io.quarkus.platform
 quarkusPlatformArtifactId=quarkus-bom
-quarkusPlatformVersion=2.7.4.Final
\ No newline at end of file
+quarkusPlatformVersion=2.11.1.Final
\ No newline at end of file
diff --git a/quarkus-beer-rest/k8s/deployment.yaml b/quarkus-beer-rest/k8s/deployment.yaml
index 6d0d597..d356183 100644
--- a/quarkus-beer-rest/k8s/deployment.yaml
+++ b/quarkus-beer-rest/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: rest-beer-service
-        image: lreimer/quarkus-beer-rest
+        image: qaware/quarkus-beer-rest
         resources:
           requests:
             memory: "128Mi"
diff --git a/quarkus-beer-rest/src/main/docker/Dockerfile.jvm b/quarkus-beer-rest/src/main/docker/Dockerfile.jvm
index ede3f88..389f08c 100644
--- a/quarkus-beer-rest/src/main/docker/Dockerfile.jvm
+++ b/quarkus-beer-rest/src/main/docker/Dockerfile.jvm
@@ -75,7 +75,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.14
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
 
diff --git a/quarkus-beer-rest/src/main/docker/Dockerfile.legacy-jar b/quarkus-beer-rest/src/main/docker/Dockerfile.legacy-jar
index ef40855..34afb88 100644
--- a/quarkus-beer-rest/src/main/docker/Dockerfile.legacy-jar
+++ b/quarkus-beer-rest/src/main/docker/Dockerfile.legacy-jar
@@ -75,7 +75,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.11
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.14
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
 
diff --git a/rest-beer-golang/Makefile b/rest-beer-golang/Makefile
index 139f783..068aaae 100644
--- a/rest-beer-golang/Makefile
+++ b/rest-beer-golang/Makefile
@@ -3,7 +3,7 @@ NAME = rest-beer-golang
 default: build
 
 image:
-	@docker build -t lreimer/$(NAME) .
+	@docker build -t qaware/$(NAME) .
 
 build:
 	@go build 
diff --git a/rest-beer-golang/go.mod b/rest-beer-golang/go.mod
index 61cc07d..0055628 100644
--- a/rest-beer-golang/go.mod
+++ b/rest-beer-golang/go.mod
@@ -1,3 +1,3 @@
-module github.com/lreimer/from-rest-to-grpc/rest-beer-golang
+module github.com/qaware/from-rest-to-grpc/rest-beer-golang
 
 go 1.17
diff --git a/rest-beer-golang/k8s/deployment.yaml b/rest-beer-golang/k8s/deployment.yaml
index 27a525a..740ee01 100644
--- a/rest-beer-golang/k8s/deployment.yaml
+++ b/rest-beer-golang/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: rest-beer-golang
-        image: lreimer/rest-beer-golang
+        image: qaware/rest-beer-golang
         resources:
           requests:
             memory: "64Mi"
diff --git a/rest-beer-service/Makefile b/rest-beer-service/Makefile
index 392a206..e54b840 100644
--- a/rest-beer-service/Makefile
+++ b/rest-beer-service/Makefile
@@ -3,7 +3,7 @@ NAME = rest-beer-service
 default: build
 
 image:
-	@docker build -t lreimer/$(NAME) .
+	@docker build -t qaware/$(NAME) .
 
 build:
 	@buf generate
diff --git a/rest-beer-service/buf.yaml b/rest-beer-service/buf.yaml
index c4d9275..191f6e8 100644
--- a/rest-beer-service/buf.yaml
+++ b/rest-beer-service/buf.yaml
@@ -1,5 +1,5 @@
 version: v1beta1
-name: github.com/lreimer/from-rest-to-grpc
+name: github.com/qaware/from-rest-to-grpc
 deps:
   - buf.build/beta/googleapis
 build:
diff --git a/rest-beer-service/go.mod b/rest-beer-service/go.mod
index f3658e5..1bc59e5 100644
--- a/rest-beer-service/go.mod
+++ b/rest-beer-service/go.mod
@@ -1,4 +1,4 @@
-module github.com/lreimer/from-rest-to-grpc/rest-beer-service
+module github.com/qaware/from-rest-to-grpc/rest-beer-service
 
 go 1.17
 
diff --git a/rest-beer-service/k8s/deployment.yaml b/rest-beer-service/k8s/deployment.yaml
index 6ab2287..566be39 100644
--- a/rest-beer-service/k8s/deployment.yaml
+++ b/rest-beer-service/k8s/deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: rest-beer-service
-        image: lreimer/rest-beer-service
+        image: qaware/rest-beer-service
         resources:
           requests:
             memory: "64Mi"
diff --git a/rest-beer-service/main.go b/rest-beer-service/main.go
index 0747fa7..7c91401 100644
--- a/rest-beer-service/main.go
+++ b/rest-beer-service/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/gin-gonic/gin"
-	"github.com/lreimer/from-rest-to-grpc/rest-beer-service/proto"
+	"github.com/qaware/from-rest-to-grpc/rest-beer-service/proto"
 )
 
 func main() {
diff --git a/rest-beer-service/proto/beer.proto b/rest-beer-service/proto/beer.proto
index f990968..2deb3a4 100644
--- a/rest-beer-service/proto/beer.proto
+++ b/rest-beer-service/proto/beer.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = "github.com/lreimer/from-rest-to-grpc/rest-beer-service/proto";
+option go_package = "github.com/qaware/from-rest-to-grpc/rest-beer-service/proto";
 package beer;
 
 message Beer {
diff --git a/skaffold.yaml b/skaffold.yaml
index 53806bb..3867527 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -8,41 +8,41 @@ build:
     gitCommit: {}
   artifacts:
     # for the Golang demo
-    # - image: lreimer/grpc-beer-client
+    # - image: qaware/grpc-beer-client
     #   context: grpc-beer-client/
-    # - image: lreimer/rest-beer-golang
+    # - image: qaware/rest-beer-golang
     #   context: rest-beer-golang/
-    # - image: lreimer/rest-beer-service
+    # - image: qaware/rest-beer-service
     #   context: rest-beer-service/
-    # - image: lreimer/grpc-beer-service
+    # - image: qaware/grpc-beer-service
     #   context: grpc-beer-service/
     
     # for the Quarkus demo
-    - image: lreimer/quarkus-beer-rest
+    - image: qaware/quarkus-beer-rest
       context: quarkus-beer-rest/
       docker:
         dockerfile: quarkus-beer-rest/src/main/docker/Dockerfile.jvm
-    - image: lreimer/quarkus-beer-grpc
+    - image: qaware/quarkus-beer-grpc
       context: quarkus-beer-grpc/
       docker:
         dockerfile: quarkus-beer-grpc/src/main/docker/Dockerfile.jvm
     
     # for the Micronaut demo
-    - image: lreimer/micronaut-beer-rest
+    - image: qaware/micronaut-beer-rest
       context: micronaut-beer-rest/
       jib:
         type: gradle
-    - image: lreimer/micronaut-beer-grpc
+    - image: qaware/micronaut-beer-grpc
       context: micronaut-beer-grpc/
       jib:
         type: gradle
 
     # for gRPC ecosystem demo
-    - image: lreimer/grpc-beer-gateway
+    - image: qaware/grpc-beer-gateway
       context: grpc-beer-gateway/
-    - image: lreimer/grpc-beer-nginx
+    - image: qaware/grpc-beer-nginx
       context: grpc-beer-nginx/
-    - image: lreimer/grpc-beer-envoy
+    - image: qaware/grpc-beer-envoy
       context: grpc-beer-envoy/
   local:
     # push: false