diff --git a/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj b/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj
index 73283d9da20..cceb96f8109 100644
--- a/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj
+++ b/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj
@@ -35,6 +35,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.18.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.0-rc1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.0" />
   </ItemGroup>
 </Project>
diff --git a/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/ModuleClientCache.cs b/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/ModuleClientCache.cs
index 7db5c8ece37..c8e2d1fb285 100644
--- a/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/ModuleClientCache.cs
+++ b/edge-modules/functions/binding/src/Microsoft.Azure.WebJobs.Extensions.EdgeHub/ModuleClientCache.cs
@@ -51,7 +51,7 @@ async Task<ModuleClient> CreateModuleClient()
             ModuleClient moduleClient = await ModuleClient.CreateFromEnvironmentAsync(TransportType.Mqtt_Tcp_Only)
                 .ConfigureAwait(false);
 
-            moduleClient.ProductInfo = "Microsoft.Azure.Devices.Edge.Functions.Binding";
+            moduleClient.ProductInfo = "Microsoft.Azure.WebJobs.Extensions.EdgeHub";
             return moduleClient;
         }
     }
diff --git a/edge-modules/functions/samples/docker/linux/arm32v7/Dockerfile b/edge-modules/functions/samples/docker/linux/arm32v7/Dockerfile
index 9303c89442c..bc53dddbb6f 100644
--- a/edge-modules/functions/samples/docker/linux/arm32v7/Dockerfile
+++ b/edge-modules/functions/samples/docker/linux/arm32v7/Dockerfile
@@ -1,8 +1,6 @@
-ARG buildno
-FROM edgebuilds.azurecr.io/microsoft/azureiotedge-functions-binding:${buildno}-linux-arm32v7
+FROM mcr.microsoft.com/azure-functions/dotnet:2.0-arm32v7
 
-WORKDIR /app
+ENV AzureWebJobsScriptRoot=/app
 
-COPY samples/ samples/
+COPY . /app
 
-ENV AzureWebJobsScriptRoot=samples
diff --git a/edge-modules/functions/samples/docker/windows/amd64/Dockerfile b/edge-modules/functions/samples/docker/windows/amd64/Dockerfile
index c992ae5ac5d..e9525204439 100644
--- a/edge-modules/functions/samples/docker/windows/amd64/Dockerfile
+++ b/edge-modules/functions/samples/docker/windows/amd64/Dockerfile
@@ -1,10 +1,5 @@
 # escape=`
 
-ARG buildno
-FROM edgebuilds.azurecr.io/microsoft/azureiotedge-functions-binding:${buildno}-windows-amd64
+FROM mcr.microsoft.com/azure-functions/dotnet:2.0-nanoserver-1803
 
-WORKDIR /app
-
-COPY $EXE_DIR/ ./$FUNCTION_FILE_NAME
-
-ENV AzureWebJobsScriptRoot=samples
\ No newline at end of file
+COPY . /approot
\ No newline at end of file
diff --git a/smoke/IotEdgeQuickstart/e2e_deployment_files/module_to_functions_deployment.template.json b/smoke/IotEdgeQuickstart/e2e_deployment_files/module_to_functions_deployment.template.json
index 83e23d73452..48a25442d6e 100644
--- a/smoke/IotEdgeQuickstart/e2e_deployment_files/module_to_functions_deployment.template.json
+++ b/smoke/IotEdgeQuickstart/e2e_deployment_files/module_to_functions_deployment.template.json
@@ -31,11 +31,11 @@
               "image": "edgebuilds.azurecr.io/microsoft/azureiotedge-hub:<Build.BuildNumber>-linux-<Architecture>",
               "createOptions": "{\"HostConfig\": {\"PortBindings\": {\"8883/tcp\": [{\"HostPort\": \"8883\"}],\"443/tcp\": [{\"HostPort\": \"443\"}],\"5671/tcp\": [{\"HostPort\": \"5671\"}]}}}"
             },
-		    "env": {
-				"OptimizeForPerformance": {
-					"value": "<OptimizeForPerformance>"
-				}
-			},
+            "env": {
+              "OptimizeForPerformance": {
+                "value": "<OptimizeForPerformance>"
+              }
+            },
             "status": "running",
             "restartPolicy": "always"
           }
@@ -59,8 +59,13 @@
             "settings": {
               "image": "edgebuilds.azurecr.io/microsoft/azureiotedge-functions-filter:<Build.BuildNumber>-linux-<Architecture>",
               "createOptions": ""
+            },
+            "env": {
+              "AZURE_FUNCTIONS_ENVIRONMENT": {
+                "value": "Development"
+              }
             }
-          },          
+          }
         }
       }
     },
@@ -77,4 +82,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file