diff --git a/.github/workflows/docker_image_builder.yml b/.github/workflows/docker_image_builder.yml
index fe2bdb41e3..d92e0f77c2 100644
--- a/.github/workflows/docker_image_builder.yml
+++ b/.github/workflows/docker_image_builder.yml
@@ -24,18 +24,26 @@ jobs:
 
       # create different images
       matrix:
-        target: [ 'otobo-web', 'otobo-elasticsearch', ]
+        target: [ 'otobo-web', 'otobo-elasticsearch', 'otobo-nginx-webproxy' ]
         include:
-          - target:     'otobo-web'
+          -
+            target:     'otobo-web'
             dockerfile: 'otobo.web.dockerfile'
             context:    '.'
             tag_prefix: 'devel'
             repository: 'rotheross/otobo'
-          - target:     'otobo-elasticsearch'
+          -
+            target:     'otobo-elasticsearch'
             dockerfile: 'otobo.elasticsearch.dockerfile'
             context:    'scripts/elasticsearch'
             tag_prefix: 'devel'
             repository: 'rotheross/otobo-elasticsearch'
+          -
+            target:     'otobo-ngingx-webproxy'
+            dockerfile: 'otobo.nginx.dockerfile'
+            context:    'scripts/nginx'
+            tag_prefix: 'devel'
+            repository: 'rotheross/otobo-nginx-webproxy'
 
     steps:
 
diff --git a/hooks/build b/hooks/build
index 7996e7adc3..0911287387 100755
--- a/hooks/build
+++ b/hooks/build
@@ -22,6 +22,7 @@
 TARGET_OPTION=$(case $DOCKERFILE_PATH in
     "otobo.web.dockerfile")                  echo "--target=otobo-web" ;;
     "otobo.elasticsearch.dockerfile")        echo "--target=otobo-elasticsearch" ;;
+    "otobo.nginx.dockerfile")                echo "--target=otobo-nginx-webproxy" ;;
     *)                                       echo "" ;;
 esac)
 
diff --git a/otobo.nginx.dockerfile b/otobo.nginx.dockerfile
index 78e8940430..7dd2d0a1dc 100644
--- a/otobo.nginx.dockerfile
+++ b/otobo.nginx.dockerfile
@@ -5,7 +5,7 @@
 
 # Use the latest nginx.
 # This image is based on Debian 10 (Buster). The User is root.
-FROM nginx:mainline
+FROM nginx:mainline AS otobo-nginx-webproxy
 
 # install some required and optional Debian packages 
 # hadolint ignore=DL3008