diff --git a/lib/ClassicUi/html/head.html b/lib/ClassicUi/html/head.html
index ef742621..bc831aa2 100644
--- a/lib/ClassicUi/html/head.html
+++ b/lib/ClassicUi/html/head.html
@@ -48,7 +48,7 @@
 <main role="main" class="container">
     <header class="navbar navbar-expand navbar-dark flex-column flex-lg-row rounded shadow mt-2 mb-3" style="background-color: var(--purple);">
         <a href="/" class="">
-            <h6 class="navbar-brand">AMS reader <small id="swVersion" data-url="https://api.github.com/repos/gskjold/AmsToMqttBridge/releases">${version}</small></h6>
+            <h6 class="navbar-brand">AMS reader <small id="swVersion" data-url="https://api.github.com/repos/UtilitechAS/amsreader-firmware/releases">${version}</small></h6>
         </a>
         <div class="navbar-nav-scroll">
             <ul class="navbar-nav bd-navbar-nav flex-row">
@@ -66,7 +66,7 @@
                             <a class="dropdown-item" href="/ntp">NTP</a>
                             <a class="dropdown-item" href="/priceapi">Price API</a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="https://github.com/gskjold/AmsToMqttBridge/wiki" target="_blank">Documentation</a>
+                            <a class="dropdown-item" href="https://github.com/UtilitechAS/amsreader-firmware/wiki" target="_blank">Documentation</a>
                         </div>
                     </div>
                 </li>
@@ -96,7 +96,7 @@
         </div>
         <ul class="navbar-nav flex-row ml-md-auto d-none d-lg-flex">
             <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
+                <a class="nav-link p-2" href="https://github.com/UtilitechAS/amsreader-firmware" target="_blank" rel="noopener" aria-label="GitHub">
                     <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
                 </a>
             </li>
diff --git a/lib/ClassicUi/html/meter.html b/lib/ClassicUi/html/meter.html
index 5659c543..076fcd60 100644
--- a/lib/ClassicUi/html/meter.html
+++ b/lib/ClassicUi/html/meter.html
@@ -65,7 +65,7 @@
                 </div>
             </div>
             <div class="col-lg-4 col-sm-8">
-                <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Known-hardware-configurations" target="_blank">Known hardware configurations</a>
+                <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Known-hardware-configurations" target="_blank">Known hardware configurations</a>
             </div>
         </div>
         <div class="row">
diff --git a/lib/ClassicUi/html/restartwait.html b/lib/ClassicUi/html/restartwait.html
index 4ef22ae8..3d0071fd 100644
--- a/lib/ClassicUi/html/restartwait.html
+++ b/lib/ClassicUi/html/restartwait.html
@@ -12,7 +12,7 @@
         <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
         <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
             <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
+                <a class="nav-link p-2" href="https://github.com/UtilitechAS/amsreader-firmware" target="_blank" rel="noopener" aria-label="GitHub">
                     <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
                 </a>
             </li>
diff --git a/lib/ClassicUi/html/setup.html b/lib/ClassicUi/html/setup.html
index 87d047f9..3c0b1e37 100644
--- a/lib/ClassicUi/html/setup.html
+++ b/lib/ClassicUi/html/setup.html
@@ -12,7 +12,7 @@
         <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
         <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
             <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
+                <a class="nav-link p-2" href="https://github.com/UtilitechAS/amsreader-firmware" target="_blank" rel="noopener" aria-label="GitHub">
                     <img style="width: 2rem; height: 2rem;" src="github.svg"/>
                 </a>
             </li>
diff --git a/lib/SvelteUi/app/src/lib/ConfigurationPanel.svelte b/lib/SvelteUi/app/src/lib/ConfigurationPanel.svelte
index 37e843fd..c76f2959 100644
--- a/lib/SvelteUi/app/src/lib/ConfigurationPanel.svelte
+++ b/lib/SvelteUi/app/src/lib/ConfigurationPanel.svelte
@@ -230,7 +230,7 @@
         </div>
         <div class="cnt">
             <strong class="text-sm">Meter</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Meter-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Meter-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="m" value="true"/>
             <div class="my-1">
                 <span>Serial configuration</span>
@@ -320,7 +320,7 @@
         </div>
         <div class="cnt">
             <strong class="text-sm">WiFi</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/WiFi-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/WiFi-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="w" value="true"/>
             <div class="my-1">
                 SSID<br/>
@@ -354,7 +354,7 @@
         </div>
         <div class="cnt">
             <strong class="text-sm">Network</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Network-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Network-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <div class="my-1">
                 IP<br/>
                 <div class="flex">
@@ -396,7 +396,7 @@
         </div>
         <div class="cnt">
             <strong class="text-sm">MQTT</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/MQTT-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/MQTT-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="q" value="true"/>
             <div class="my-1">
                 Server
@@ -471,7 +471,7 @@
         {#if configuration.q.m == 3}
         <div class="cnt">
             <strong class="text-sm">Domoticz</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/MQTT-configuration#domoticz" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/MQTT-configuration#domoticz" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="o" value="true"/>
             <div class="my-1 flex">
                 <div class="w-1/2">
@@ -488,7 +488,7 @@
                 <div class="flex">
                     <input name="ou1" bind:value={configuration.o.u1} type="text" class="in-f tr w-1/3"/>
                     <input name="ou2" bind:value={configuration.o.u2} type="text" class="in-m tr w-1/3"/>
-                    <input name="ou2" bind:value={configuration.o.u3} type="text" class="in-l tr w-1/3"/>
+                    <input name="ou3" bind:value={configuration.o.u3} type="text" class="in-l tr w-1/3"/>
                 </div>
             </div>
         </div>
@@ -496,7 +496,7 @@
         {#if configuration.p.r.startsWith("10YNO") || configuration.p.r == '10Y1001A1001A48H'}
         <div class="cnt">
             <strong class="text-sm">Tariff thresholds</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Threshold-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Threshold-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             <input type="hidden" name="t" value="true"/>
             <div class="flex flex-wrap my-1">
                 <label class="flex w-40 m-1">
@@ -649,7 +649,7 @@
         {#if sysinfo.board > 20 || sysinfo.chip == 'esp8266'}
         <div class="cnt">
             <strong class="text-sm">Hardware</strong>
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/GPIO-configuration" target="_blank" class="float-right"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/GPIO-configuration" target="_blank" class="float-right"><HelpIcon/></a>
             {#if sysinfo.board > 20}
             <input type="hidden" name="i" value="true"/>
             <div class="flex flex-wrap">
diff --git a/lib/SvelteUi/app/src/lib/ConsentComponent.svelte b/lib/SvelteUi/app/src/lib/ConsentComponent.svelte
index 3e8568d3..cf69870a 100644
--- a/lib/SvelteUi/app/src/lib/ConsentComponent.svelte
+++ b/lib/SvelteUi/app/src/lib/ConsentComponent.svelte
@@ -41,7 +41,7 @@
             <hr/>
             <div class="my-3">
                 Enable one-click upgrade? (implies data collection)<br/>
-                <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Data-collection-on-one-click-firmware-upgrade" target="_blank" class="text-blue-600 hover:text-blue-800">Read more</a><br/>
+                <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Data-collection-on-one-click-firmware-upgrade" target="_blank" class="text-blue-600 hover:text-blue-800">Read more</a><br/>
                 <label><input type="radio" name="sf" value={1} checked={sysinfo.fwconsent === 1} class="rounded m-2" required/> Yes</label><label><input type="radio" name="sf" value={2} checked={sysinfo.fwconsent === 2} class="rounded m-2" required/> No</label><br/>
             </div>
             <div class="my-3">
diff --git a/lib/SvelteUi/app/src/lib/DataStores.js b/lib/SvelteUi/app/src/lib/DataStores.js
index 32ea927e..d664fc25 100644
--- a/lib/SvelteUi/app/src/lib/DataStores.js
+++ b/lib/SvelteUi/app/src/lib/DataStores.js
@@ -177,7 +177,7 @@ let releases = [];
 export const gitHubReleaseStore = writable(releases);
 
 export async function getGitHubReleases() {
-    const response = await fetchWithTimeout("https://api.github.com/repos/gskjold/AmsToMqttBridge/releases");
+    const response = await fetchWithTimeout("https://api.github.com/repos/UtilitechAS/amsreader-firmware/releases");
     releases = (await response.json())
     gitHubReleaseStore.set(releases);
 };
diff --git a/lib/SvelteUi/app/src/lib/Header.svelte b/lib/SvelteUi/app/src/lib/Header.svelte
index 3d30cafb..b0d870bc 100644
--- a/lib/SvelteUi/app/src/lib/Header.svelte
+++ b/lib/SvelteUi/app/src/lib/Header.svelte
@@ -70,7 +70,7 @@
         {/if}
       <div class="flex-auto p-2 flex flex-row-reverse flex-wrap">
           <div class="flex-none">
-            <a class="float-right" href='https://github.com/gskjold/AmsToMqttBridge' target='_blank' rel="noreferrer" aria-label="GitHub"><img class="gh-logo" src={GitHubLogo} alt="GitHub repo"/></a>
+            <a class="float-right" href='https://github.com/UtilitechAS/amsreader-firmware' target='_blank' rel="noreferrer" aria-label="GitHub"><img class="gh-logo" src={GitHubLogo} alt="GitHub repo"/></a>
           </div>
           <div class="flex-none my-auto px-2">
             <Clock timestamp={ data.c ? new Date(data.c * 1000) : new Date(0) } />
@@ -84,7 +84,7 @@
           </div>
           {/if}
           <div class="flex-none px-1 mt-1" title="Documentation">
-            <a href="https://github.com/gskjold/AmsToMqttBridge/wiki" target='_blank' rel="noreferrer"><HelpIcon/></a>
+            <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki" target='_blank' rel="noreferrer"><HelpIcon/></a>
           </div>
           {#if sysinfo.fwconsent === 1 && nextVersion}
           <div class="flex-none mr-3 text-yellow-500" title="New version: {nextVersion.tag_name}">