diff --git a/terraform/lambdas.tf b/terraform/lambdas.tf
index f19cfc8..e2a090b 100644
--- a/terraform/lambdas.tf
+++ b/terraform/lambdas.tf
@@ -11,10 +11,10 @@ resource "aws_lambda_function" "raster_analysis" {
   tags             = local.tags
   layers           = [
     module.lambda_layers.raster_analysis_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_138_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn,
   ]
 
   tracing_config {
@@ -46,10 +46,10 @@ resource "aws_lambda_function" "tiled_raster_analysis" {
   tags             = local.tags
   layers           = [
     module.lambda_layers.raster_analysis_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_138_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn
+    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn
   ]
 
   tracing_config {
@@ -82,7 +82,8 @@ resource "aws_lambda_function" "raster_analysis_fanout" {
   tags             = local.tags
   layers           = [
     module.lambda_layers.raster_analysis_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn,
   ]
 
   tracing_config {
@@ -111,10 +112,10 @@ resource "aws_lambda_function" "preprocessing" {
   tags             = local.tags
   layers           = [
     module.lambda_layers.raster_analysis_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_geopandas_0144_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn
+    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_geopandas_no_numpy_no_pandas_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn
   ]
 
   tracing_config {
@@ -143,10 +144,10 @@ resource "aws_lambda_function" "list_tiled_raster_analysis" {
   tags             = local.tags
   layers           = [
     module.lambda_layers.raster_analysis_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_138_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn
+    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn
   ]
 
   tracing_config {
@@ -179,10 +180,10 @@ resource "aws_lambda_function" "aggregation" {
   tags             = local.tags
   layers           = [
     module.lambda_layers.raster_analysis_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_1264_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_138_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_185_arn,
-    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_153_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_rasterio_no_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_shapely_no_numpy_arn,
+    data.terraform_remote_state.lambda-layers.outputs.py310_pandas_no_numpy_arn,
   ]
 
   tracing_config {