diff --git a/README.md b/README.md
index 877b633e..89d22795 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ To run a Docker container with [Work Directory](https://github.com/jenkinsci/rem
     
   Windows agent:
 
-    docker run jenkins/jnlp-agent-windows -Url http://jenkins-server:port -WorkDir=C:/Jenkins/agent -Secret <secret> -Name <agent name>
+    docker run jenkins/inbound-agent:windowsservercore-1809 -Url http://jenkins-server:port -WorkDir=C:/Jenkins/agent -Secret <secret> -Name <agent name>
 
 Optional environment variables:
 
diff --git a/make.ps1 b/make.ps1
index 1b9e0372..476cae92 100644
--- a/make.ps1
+++ b/make.ps1
@@ -9,7 +9,7 @@ Param(
     [switch] $PushVersions = $false
 )
 
-$Repository = 'jnlp-agent'
+$Repository = 'inbound-agent'
 $Organization = 'jenkins'
 
 if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_REPO)) {
@@ -23,11 +23,11 @@ if(![String]::IsNullOrWhiteSpace($env:DOCKERHUB_ORGANISATION)) {
 $builds = @{
     'jdk8' = @{
         'Folder' = '8\windowsservercore-1809';
-        'Tags' = @( "latest", "windowsservercore-1809", "jdk8", "windowsservercore-1809-jdk8" );
+        'Tags' = @( "windowsservercore-1809", "windowsservercore-1809-jdk8" );
     };
     'jdk11' = @{
         'Folder' = '11\windowsservercore-1809';
-        'Tags' = @( "windowsservercore-1809-jdk11", "jdk11" );
+        'Tags' = @( "windowsservercore-1809-jdk11" );
     };
     'nanoserver' = @{
         'Folder' = '8\nanoserver-1809';