diff --git a/flags/eigendaflags/cli.go b/flags/eigendaflags/cli.go
index 7106afcd..d0b38a15 100644
--- a/flags/eigendaflags/cli.go
+++ b/flags/eigendaflags/cli.go
@@ -28,7 +28,7 @@ func withFlagPrefix(s string) string {
 }
 
 func withEnvPrefix(envPrefix, s string) []string {
-	return []string{envPrefix + "_EIGENDA_" + s}
+	return []string{envPrefix + "_EIGENDA_CLIENT_" + s, envPrefix + "_" + s}
 }
 
 // CLIFlags ... used for EigenDA client configuration
diff --git a/store/precomputed_key/s3/cli.go b/store/precomputed_key/s3/cli.go
index 4e2d0be2..3305c354 100644
--- a/store/precomputed_key/s3/cli.go
+++ b/store/precomputed_key/s3/cli.go
@@ -32,7 +32,7 @@ func CLIFlags(envPrefix, category string) []cli.Flag {
 		&cli.StringFlag{
 			Name:     EndpointFlagName,
 			Usage:    "endpoint for S3 storage",
-			EnvVars:  withEnvPrefix(envPrefix, "S3_ENDPOINT"),
+			EnvVars:  withEnvPrefix(envPrefix, "ENDPOINT"),
 			Category: category,
 		},
 		&cli.StringFlag{
diff --git a/verify/cli.go b/verify/cli.go
index ba996951..21dca993 100644
--- a/verify/cli.go
+++ b/verify/cli.go
@@ -41,7 +41,7 @@ func withFlagPrefix(s string) string {
 }
 
 func withEnvPrefix(envPrefix, s string) []string {
-	return []string{envPrefix + "_EIGENDA_" + s}
+	return []string{envPrefix + "_EIGENDA_CLIENT_" + s, envPrefix + "_" + s}
 }
 
 // CLIFlags ... used for Verifier configuration