diff --git a/build.ps1 b/build.ps1
index c8fa22c45..00de3da68 100644
--- a/build.ps1
+++ b/build.ps1
@@ -3,24 +3,23 @@ Param(
     [String] $TagPrefix = 'latest',
     [String] $AdditionalArgs = '',
     [String] $Build = '',
-    [String] $Repository = 'jenkins4eval'
+    [String] $Repository = 'remoting',
+    [String] $Organization = 'jenkins4eval'
 )
 
 $builds = @{
     'default' = @{'Dockerfile' = 'Dockerfile-windows' ; 'TagSuffix' = '-windows' };
     'jdk11' = @{'DockerFile' = 'Dockerfile-windows-jdk11'; 'TagSuffix' = '-windows-jdk11' };
-    #'nanoserver' = 'Dockerfile-windows-nanoserver';
-    #'nanoserver-jdk11' = 'Dockerfile-windows-nanoserver-jdk11';
 }
 
 if(![System.String]::IsNullOrWhiteSpace($Build) -and $builds.ContainsKey($Build)) {
     Write-Host "Building $build => tag=$TagPrefix$($builds[$build]['TagSuffix'])"
-    $cmd = "docker build -f {0} -t {1}/agent:{2}{3} {4} ." -f $builds[$build]['Dockerfile'], $Repository, $TagPrefix, $builds[$build]['TagSuffix'], $AdditionalArgs
+    $cmd = "docker build -f {0} -t {1}/{2}:{3}{4} {5} ." -f $builds[$build]['Dockerfile'], $Organization, $Repository, $TagPrefix, $builds[$build]['TagSuffix'], $AdditionalArgs
     Invoke-Expression $cmd
 } else {
     foreach($build in $builds.Keys) {
         Write-Host "Building $build => tag=$TagPrefix$($builds[$build]['TagSuffix'])"
-        $cmd = "docker build -f {0} -t {1}/agent:{2}{3} {4} ." -f $builds[$build]['Dockerfile'], $Repository, $TagPrefix, $builds[$build]['TagSuffix'], $AdditionalArgs
+        $cmd = "docker build -f {0} -t {1}/{2}:{3}{4} {5} ." -f $builds[$build]['Dockerfile'], $Organization, $Repository, $TagPrefix, $builds[$build]['TagSuffix'], $AdditionalArgs
         Invoke-Expression $cmd
     }
 }