diff --git a/.github/workflows/installer.build.yml b/.github/workflows/installer.build.yml
index bff67204..56ccb34b 100644
--- a/.github/workflows/installer.build.yml
+++ b/.github/workflows/installer.build.yml
@@ -6,6 +6,7 @@ on:
       - main
       - 'release-*'
       - 'beta-release-*'
+      - 'fix-tun-ip-reporting'
 
 env:
   BUILD_CONFIG: "Release"
diff --git a/DesktopEdge/Views/Screens/MainMenu.xaml b/DesktopEdge/Views/Screens/MainMenu.xaml
index 93b05f2b..8f424d0a 100644
--- a/DesktopEdge/Views/Screens/MainMenu.xaml
+++ b/DesktopEdge/Views/Screens/MainMenu.xaml
@@ -101,8 +101,9 @@
                     <local:MenuEditItem x:Name="ConfigIp" HorizontalAlignment="Stretch" Width="Auto" Label="IPv4 Address:"></local:MenuEditItem>
                     <local:MenuEditItem x:Name="ConfigSubnet" HorizontalAlignment="Stretch" Width="Auto" Label="Subnet Mask:"></local:MenuEditItem>
                     <local:MenuEditItem x:Name="ConfigMtu" HorizontalAlignment="Stretch" Width="Auto" Label="MTU:"></local:MenuEditItem>
-                    <local:MenuEditItem x:Name="ConfigDns" HorizontalAlignment="Stretch" Width="Auto" Label="DNS Servers:"></local:MenuEditItem>
+                    <local:MenuEditItem x:Name="ConfigDns" HorizontalAlignment="Stretch" Width="Auto" Label="DNS Server:"></local:MenuEditItem>
                     <local:MenuEditItem x:Name="ConfigPageSize" HorizontalAlignment="Stretch" Width="Auto" Label="Api Page Size (10-500):"></local:MenuEditItem>
+                    <local:MenuEditItem x:Name="ConfigDnsEnabled" HorizontalAlignment="Stretch" Width="Auto" Label="Add Dns:"></local:MenuEditItem>
                     <local:StyledButton x:Name="EditButton" OnClick="ShowEdit" Label="Edit Values" Grid.Row="8" Margin="0,20,0,0"></local:StyledButton>
                 </StackPanel>
                 <ScrollViewer Name="IdListScrollView" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Auto" CanContentScroll="True" ClipToBounds="True" Visibility="Collapsed">
diff --git a/DesktopEdge/Views/Screens/MainMenu.xaml.cs b/DesktopEdge/Views/Screens/MainMenu.xaml.cs
index 1d01549d..df6383be 100644
--- a/DesktopEdge/Views/Screens/MainMenu.xaml.cs
+++ b/DesktopEdge/Views/Screens/MainMenu.xaml.cs
@@ -242,13 +242,8 @@ namespace ZitiDesktopEdge {
                 ConfigIp.Value = Application.Current.Properties["ip"]?.ToString();
 				ConfigSubnet.Value = Application.Current.Properties["subnet"]?.ToString();
 				ConfigMtu.Value = Application.Current.Properties["mtu"]?.ToString();
-				string dnsValue = "disabled";
-				if (Application.Current.Properties.Contains("dnsenabled")) {
-					if ((bool)Application.Current.Properties["dnsenabled"] && Application.Current.Properties.Contains("dns")) {
-						dnsValue = Application.Current.Properties["dns"].ToString();
-					}
-				}
-				ConfigDns.Value = dnsValue;
+				ConfigDns.Value = Application.Current.Properties["dns"]?.ToString();
+				ConfigDnsEnabled.Value = Application.Current.Properties["dnsenabled"]?.ToString();
 			} else if (menuState == "Identities") {
 				MenuTitle.Content = "Identities";
 				IdListScrollView.Visibility = Visibility.Visible;
diff --git a/release-notes.md b/release-notes.md
index 5d2b639c..d50c52aa 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,17 @@
+# Release 2.1.5
+
+## What's New
+* DNS server IP has changed! If you expect the DNS server to be at 100.64.0.3 (or IP + 2) it will now be IP + 1.
+* It is no longer possible to have the DNS server overlap the IP assigned to the interface
+
+## Other changes:
+
+## Bugs fixed:
+* [bug 560](https://github.com/openziti/desktop-edge-win/issues/560) - fix IP display on tunnel config page.
+
+## Dependency Updates
+* TSDK updated to 0.19.7 / CSDK 0.29.4
+
 # Release 2.1.4
 
 ## What's New
diff --git a/version b/version
index 7d2ed7c7..cd57a8b9 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.1.4
+2.1.5
diff --git a/ziti-edge-tunnel/build.bat b/ziti-edge-tunnel/build.bat
index 40084ef1..08664f67 100644
--- a/ziti-edge-tunnel/build.bat
+++ b/ziti-edge-tunnel/build.bat
@@ -14,7 +14,7 @@ REM See the License for the specific language governing permissions and
 REM limitations under the License.
 REM
 SET REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c.git
-SET ZITI_TUNNEL_REPO_BRANCH=v0.19.7
+SET ZITI_TUNNEL_REPO_BRANCH=fix-tun-ip-reporting
 REM override the c sdk used in the build - leave blank for the same as specified in the tunneler sdk
 SET ZITI_SDK_C_BRANCH=
 SET ZITI_TUNNEL_REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c/releases/latest/download/ziti-edge-tunnel-Windows_x86_64.zip