diff --git a/.github/workflows/validate-build.yml b/.github/workflows/validate-build.yml
index b04879d..1e727e8 100644
--- a/.github/workflows/validate-build.yml
+++ b/.github/workflows/validate-build.yml
@@ -30,7 +30,10 @@ jobs:
         for dir in ${ALL_CHANGED_FILES}; do
             echo "Change detected in $dir ..."
             cd $dir
-            if [ ! -f config.env ]; then
+            if [ ! -f config.env ] && ([ -f Dockerfile ] || [ -f Containerfile ]); then
+                echo "No config.env file present in changed directory that contains image files. Throwing error ..."
+                exit 1
+            elif [ ! -f config.env ]; then
                 echo "No config.env file present in changed directory, skipping ..."
                 cd $BASE_DIR
                 continue
diff --git a/models/detr-resnet-101 /.dockerignore b/models/detr-resnet-101/.dockerignore
similarity index 100%
rename from models/detr-resnet-101 /.dockerignore
rename to models/detr-resnet-101/.dockerignore
diff --git a/models/detr-resnet-101 /Containerfile b/models/detr-resnet-101/Containerfile
similarity index 97%
rename from models/detr-resnet-101 /Containerfile
rename to models/detr-resnet-101/Containerfile
index 8715d57..b97b8c7 100644
--- a/models/detr-resnet-101 /Containerfile	
+++ b/models/detr-resnet-101/Containerfile
@@ -10,7 +10,7 @@
 FROM registry.access.redhat.com/ubi9/ubi-micro:9.4-9
 
 # Can be substituted using the --build-arg defined above
-ARG MODEL_URL=./detr-resnet-101
+ARG MODEL_URL=./
 
 # By default the Model Server container image uses the AI Model stored in the model/model.file file.
 WORKDIR /model
diff --git a/models/detr-resnet-101 /README.md b/models/detr-resnet-101/README.md
similarity index 100%
rename from models/detr-resnet-101 /README.md
rename to models/detr-resnet-101/README.md
diff --git a/models/detr-resnet-101 /config.env b/models/detr-resnet-101/config.env
similarity index 100%
rename from models/detr-resnet-101 /config.env
rename to models/detr-resnet-101/config.env