diff --git a/Dockerfile-WeatherService b/Weather/Service/Dockerfile
similarity index 62%
rename from Dockerfile-WeatherService
rename to Weather/Service/Dockerfile
index 5052d25..583167e 100644
--- a/Dockerfile-WeatherService
+++ b/Weather/Service/Dockerfile
@@ -4,11 +4,10 @@ EXPOSE 80
 
 FROM microsoft/dotnet:2.2-sdk-stretch AS build
 WORKDIR /src
-COPY ["Weather/Service/Service.csproj", "Weather/Service/"]
-COPY ["Weather/Models/Models.csproj", "Weather/Models/"]
-RUN dotnet restore "Weather/Service/Service.csproj"
+COPY ["./Service.csproj", "./"]
+RUN dotnet restore "Service.csproj"
 COPY . .
-WORKDIR "/src/Weather/Service"
+WORKDIR "/src"
 RUN dotnet publish "Service.csproj" -c Release -o /app
 
 FROM base AS final
diff --git a/Weather/Service/Service.csproj b/Weather/Service/Service.csproj
index df04f28..5a089be 100644
--- a/Weather/Service/Service.csproj
+++ b/Weather/Service/Service.csproj
@@ -19,15 +19,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.6" />
     <PackageReference Include="Dapper" Version="1.60.6" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="1.1.0" />
-    <PackageReference Include="Npgsql" Version="4.0.7" />
+    <PackageReference Include="Npgsql" Version="4.0.8" />
     <PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Models\Models.csproj" />
-  </ItemGroup>
-
 </Project>