diff --git a/dependency_cache.go b/dependency_cache.go
index 16c61b4..6d5ae90 100644
--- a/dependency_cache.go
+++ b/dependency_cache.go
@@ -264,7 +264,7 @@ func (d *DependencyCache) Artifact(dependency BuildModuleDependency, mods ...Req
 			color.New(color.FgYellow, color.Bold).Sprint("Warning:"))
 
 		d.Logger.Bodyf("%s from %s", color.YellowString("Downloading"), urlP.Redacted())
-		artifact = filepath.Join(d.DownloadPath, filepath.Base(uri))
+		artifact = filepath.Join(d.DownloadPath, filepath.Base(urlP.Path))
 		if err := d.download(urlP, artifact, mods...); err != nil {
 			return nil, fmt.Errorf("unable to download %s\n%w", urlP.Redacted(), err)
 		}
@@ -296,7 +296,7 @@ func (d *DependencyCache) Artifact(dependency BuildModuleDependency, mods ...Req
 	}
 
 	d.Logger.Bodyf("%s from %s", color.YellowString("Downloading"), urlP.Redacted())
-	artifact = filepath.Join(d.DownloadPath, dependency.SHA256, filepath.Base(uri))
+	artifact = filepath.Join(d.DownloadPath, dependency.SHA256, filepath.Base(urlP.Path))
 	if err := d.download(urlP, artifact, mods...); err != nil {
 		return nil, fmt.Errorf("unable to download %s\n%w", urlP.Redacted(), err)
 	}
diff --git a/dependency_cache_test.go b/dependency_cache_test.go
index 7c487f3..ed59bb3 100644
--- a/dependency_cache_test.go
+++ b/dependency_cache_test.go
@@ -18,6 +18,7 @@ package libpak_test
 
 import (
 	"bytes"
+	"crypto/sha256"
 	"fmt"
 	"io"
 	"net/http"
@@ -560,6 +561,31 @@ func testDependencyCache(t *testing.T, context spec.G, it spec.S) {
 			Expect(io.ReadAll(a)).To(Equal([]byte("alternate-fixture")))
 		})
 
+		it("sets downloaded file name to uri's path without query params", func() {
+			server.AppendHandlers(ghttp.RespondWith(http.StatusOK, "test-fixture"))
+
+			a, err := dependencyCache.Artifact(dependency)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(io.ReadAll(a)).To(Equal([]byte("test-fixture")))
+			Expect(filepath.Base(a.Name())).To(Equal("test-path"))
+		})
+
+		it("sets downloaded file name to uri's path without query params when the SHA256 is empty", func() {
+			dependency.SHA256 = ""
+			dependency.URI = fmt.Sprintf("%s/test-path?param1=value1&param2=value2", server.URL())
+			server.AppendHandlers(ghttp.RespondWith(http.StatusOK, "alternate-fixture"))
+
+			hasher := sha256.New()
+			hasher.Write([]byte(dependency.URI))
+
+			a, err := dependencyCache.Artifact(dependency)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(io.ReadAll(a)).To(Equal([]byte("alternate-fixture")))
+			Expect(filepath.Base(a.Name())).To(Equal("test-path"))
+		})
+
 		it("sets User-Agent", func() {
 			server.AppendHandlers(ghttp.CombineHandlers(
 				ghttp.VerifyHeaderKV("User-Agent", "test-user-agent"),