diff --git a/get-specific-version.sh b/get-specific-version.sh
index dbc15d8..3f6fd69 100755
--- a/get-specific-version.sh
+++ b/get-specific-version.sh
@@ -1,18 +1,20 @@
 #!/bin/sh
 if [ -n "${DBS_VERSION}" ]; then
-  if [ ! -f /usr/share/docker-bench-security/v${DBS_VERSION}.tar.gz ]; then
-    echo "Getting docker-bench-security v${DBS_VERSION}..."
-    wget -q -P /usr/share/docker-bench-security/ https://github.com/docker/docker-bench-security/archive/v${DBS_VERSION}.tar.gz
-    rm -rf /usr/share/docker-bench-security/docker-bench-security-${DBS_VERSION}/
-    tar xfz /usr/share/docker-bench-security/v${DBS_VERSION}.tar.gz -C /usr/share/docker-bench-security/
+  if [ ! -f /usr/share/docker-bench-security/${DBS_VERSION}.tar.gz ]; then
+    echo "Getting docker-bench-security ${DBS_VERSION}..."
+    wget -q -P /usr/share/docker-bench-security/ https://github.com/docker/docker-bench-security/archive/${DBS_VERSION}.tar.gz
+    rm -rf /usr/share/docker-bench-security/${DBS_VERSION}/
+    mkdir -p /usr/share/docker-bench-security/${DBS_VERSION}/
+    tar xfz /usr/share/docker-bench-security/${DBS_VERSION}.tar.gz -C /usr/share/docker-bench-security/${DBS_VERSION} --strip 1 --overwrite
+    rm -rfv /usr/share/docker-bench-security/${DBS_VERSION}.tar.gz
   fi
-  
-  if [ -d /usr/share/docker-bench-security/docker-bench-security-${DBS_VERSION}/ ]; then
+
+  if [ $(find /usr/share/docker-bench-security/ | wc -l) -gt 1  ]; then
     rm -rf /usr/local/bin/docker-bench-security.sh /usr/local/bin/helper_lib.sh /usr/local/bin/output_lib.sh
     rm -rf /usr/local/bin/tests/*
-  
-    cp -r /usr/share/docker-bench-security/docker-bench-security-${DBS_VERSION}/*.sh /usr/local/bin/
-    cp -r /usr/share/docker-bench-security/docker-bench-security-${DBS_VERSION}/tests/*.sh /usr/local/bin/tests/
+
+    cp -r /usr/share/docker-bench-security/${DBS_VERSION}/*.sh /usr/local/bin/
+    cp -r /usr/share/docker-bench-security/${DBS_VERSION}/tests/*.sh /usr/local/bin/tests/
   fi
 fi