diff --git a/charts/device-data-api/values-prod.yaml b/charts/device-data-api/values-prod.yaml
index 7eae2c8..e58e5b9 100644
--- a/charts/device-data-api/values-prod.yaml
+++ b/charts/device-data-api/values-prod.yaml
@@ -7,6 +7,7 @@ cronJob:
   enabled: true
   schedule: 0 0 * * 0
 env:
+  DB_SSL_MODE: disable
   ENVIRONMENT: prod
   PORT: '8080'
   LOG_LEVEL: info
diff --git a/charts/device-data-api/values.yaml b/charts/device-data-api/values.yaml
index 8f01c6d..519daf1 100644
--- a/charts/device-data-api/values.yaml
+++ b/charts/device-data-api/values.yaml
@@ -51,6 +51,7 @@ env:
   DEVICE_DEFINITIONS_GRPC_ADDR: device-definitions-api-dev:8086
   DB_PORT: '5432'
   DB_NAME: device_data_api
+  DB_SSL_MODE: require
   DB_MAX_OPEN_CONNECTIONS: '10'
   DB_MAX_IDLE_CONNECTIONS: '3'
   KAFKA_BROKERS: kafka-dev-dimo-kafka-kafka-brokers:9092
diff --git a/go.mod b/go.mod
index b8c4eef..5792f1d 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.23.1
 
 require (
 	github.com/DIMO-Network/devices-api v1.24.7
-	github.com/DIMO-Network/shared v0.12.1
+	github.com/DIMO-Network/shared v0.12.9
 	github.com/IBM/sarama v1.43.3
 	github.com/aws/aws-sdk-go-v2 v1.30.3
 	github.com/aws/aws-sdk-go-v2/config v1.27.27
@@ -21,7 +21,6 @@ require (
 	github.com/gofiber/fiber/v2 v2.52.5
 	github.com/gofiber/swagger v1.0.0
 	github.com/golang-jwt/jwt/v5 v5.2.1
-	github.com/golang/mock v1.6.0
 	github.com/google/subcommands v1.2.0
 	github.com/google/uuid v1.6.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -99,6 +98,7 @@ require (
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -153,6 +153,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.29.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
 )
diff --git a/go.sum b/go.sum
index 69cba41..e35680b 100644
--- a/go.sum
+++ b/go.sum
@@ -68,12 +68,10 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM=
 github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
-github.com/DIMO-Network/device-definitions-api v1.0.32 h1:4AfU6RFk0EmFPgjtaC9oWzSdLA5KmdlCfRjK6Sen32w=
-github.com/DIMO-Network/device-definitions-api v1.0.32/go.mod h1:MwWv2OLNGcyA76Pcbxyipu+vFaM8gw/G7YnX+SiEhUk=
 github.com/DIMO-Network/devices-api v1.24.7 h1:ZrNByEa62X7+kWs24mmbhe79a7NEkSbi0y1wYgwcE1I=
 github.com/DIMO-Network/devices-api v1.24.7/go.mod h1:HaeFDPFovccg1M8NfmNjopEOn0xwcnKNOCYG+yl7FT4=
-github.com/DIMO-Network/shared v0.12.1 h1:vYnXZSZKR3tzixXreTAuDx9OFe37m7Xzoacx9C5+UAM=
-github.com/DIMO-Network/shared v0.12.1/go.mod h1:UbxVeHgaEeTo7QrzB0t1oVDh+5y79lIPqr8gv65e6Pk=
+github.com/DIMO-Network/shared v0.12.9 h1:I41R/d84WedhQERdT7Iu7Bq8OnmLLQormfQb9g+vl1M=
+github.com/DIMO-Network/shared v0.12.9/go.mod h1:lDHUKwwT2LW6Zvd42Nb33dXklRNTmfyOlbUNx2dQfGY=
 github.com/DIMO-Network/users-api v0.7.1 h1:VxTvBy4FC83Zi6gh+iYG3Gm0phPFtP3SOyjyjSeOaUY=
 github.com/DIMO-Network/users-api v0.7.1/go.mod h1:Yf3GbL8jmMCYxpEAoZnxG7bH+LS4B0bdb8Hd7yv3tiA=
 github.com/DIMO-Network/yaml v0.1.0 h1:KQ3oKHUZETchR6Pxbmmol3e4ewrPv/q8cEwqxfwyZbU=