diff --git a/builder/Dockerfile b/builder/Dockerfile
index 0e62f080..f077d8c5 100644
--- a/builder/Dockerfile
+++ b/builder/Dockerfile
@@ -34,13 +34,15 @@ LABEL maintainer="Microsoft" \
     org.label-schema.vcs-url="https://github.com/azure/dev-box-images.git" \
     org.label-schema.docker.cmd="docker run ghcr.io/azure/dev-box-images/builder:$IMAGE_VERSION"
 
-# install packer
-RUN apk add --no-cache packer --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
-
+# manually download and install packer
+RUN wget https://releases.hashicorp.com/packer/1.7.10/packer_1.7.10_linux_amd64.zip -O /tmp/packer.zip && \
+    unzip /tmp/packer.zip -d /usr/local/bin && \
+    rm /tmp/packer.zip
+    
 COPY . /builder.d
 
 # Terminate container on stop
 STOPSIGNAL SIGTERM
 
 CMD [ "" ]
-ENTRYPOINT [ "python", "/builder.d/builder.py" ]
\ No newline at end of file
+ENTRYPOINT [ "python", "/builder.d/builder.py" ]
diff --git a/builder/azure.py b/builder/azure.py
index 9d2d67f8..c375e9d4 100644
--- a/builder/azure.py
+++ b/builder/azure.py
@@ -43,6 +43,27 @@ def _img_ver_show_cmd(image):
     return ['sig', 'image-version', 'show', '--only-show-errors', '-g', image['gallery']['resourceGroup'],
             '-r', image['gallery']['name'], '-i', image['name'], '-e', image['version'], '--subscription', image['gallery']['subscription']]
 
+def increment_version(version):
+    parts = version.split('.')
+    parts = [int(part) for part in parts]
+    parts[-1] += 1
+    parts = [str(part) for part in parts]
+    new_version = '.'.join(parts)
+    return new_version
+
+
+def get_latest_image_version(image):
+    cmd = ['sig', 'image-version', 'list', '-g', image['gallery']['resourceGroup'],
+            '-r', image['gallery']['name'], '-i', image['name'], '--subscription', image['gallery']['subscription']]
+    versions = cli(cmd)
+
+    if versions:
+        latest_version = max(versions, key=lambda v: v['name'])
+        log.info(f'Latest version of image {image["name"]} is {latest_version["name"]}' )
+        return increment_version(latest_version["name"])
+    else:
+        log.warning(f'No versions found for image {image["name"]}')
+        return image['version']
 
 def _img_def_create_cmd(image):
     return ['sig', 'image-definition', 'create', '--only-show-errors', '-g', image['gallery']['resourceGroup'],
@@ -111,7 +132,7 @@ def ensure_image_def_version(image):
     image_name = image['name']
     image_version = image['version']
 
-    build = False
+    build = True
 
     log.info(f'Validating image definition and version for {image_name}')
     log.info(f'Checking if image definition exists for {image_name}')
@@ -121,15 +142,8 @@ def ensure_image_def_version(image):
 
         log.info(f'Found existing image definition for {image_name}')
         log.info(f'Checking if image version {image_version} exists for {image_name}')
-        imgver = cli(_img_ver_show_cmd(image))
-
-        if imgver:
-            log.info(f'Found existing image version {image_version} for {image_name}')
-            log.warning(f'{image_name} was not built because version {image_version} already exists. Please update the version number or delete the existing image version and try again.')
-        else:  # image version does not exist, add it to the list of images to create
-            log.info(f'Image version {image_version} does not exist for {image_name}')
-            build = True
 
+        image['version'] = get_latest_image_version(image)
     else:  # image definition does not exist, create it and skip the version check
 
         log.info(f'Image definition does not exist for {image_name}')
@@ -229,7 +243,7 @@ async def ensure_image_def_version_async(image):
     image_name = image['name']
     image_version = image['version']
 
-    build = False
+    build = True
 
     log.info(f'Validating image definition and version for {image_name}')
     log.info(f'Checking if image definition exists for {image_name}')
@@ -239,15 +253,8 @@ async def ensure_image_def_version_async(image):
 
         log.info(f'Found existing image definition for {image_name}')
         log.info(f'Checking if image version {image_version} exists for {image_name}')
-        imgver = await cli_async(_img_ver_show_cmd(image))
-
-        if imgver:
-            log.info(f'Found existing image version {image_version} for {image_name}')
-            log.warning(f'{image_name} was not built because version {image_version} already exists. Please update the version number or delete the existing image version and try again.')
-        else:  # image version does not exist, add it to the list of images to create
-            log.info(f'Image version {image_version} does not exist for {image_name}')
-            build = True
 
+        image['version'] = get_latest_image_version(image)
     else:  # image definition does not exist, create it and skip the version check
 
         log.info(f'Image definition does not exist for {image_name}')
diff --git a/builder/templates/builder.bicep b/builder/templates/builder.bicep
index 2a128772..e2efe022 100644
--- a/builder/templates/builder.bicep
+++ b/builder/templates/builder.bicep
@@ -5,7 +5,7 @@
 param location string = resourceGroup().location
 
 @description('Container image to deploy. Should be of the form repoName/imagename:tag for images stored in public Docker Hub, or a fully qualified URI for other registries.')
-param container string = 'ghcr.io/azure/dev-box-images/builder'
+param container string = 'dockerdevbox.azurecr.io/dev/devbox:latest'
 
 @secure()
 @description('The git repository that contains your image.yml and buiild scripts.')