diff --git a/app/portainer/components/custom-templates-list/customTemplatesList.html b/app/portainer/components/custom-templates-list/customTemplatesList.html
index 40ff84d42..9b160717c 100644
--- a/app/portainer/components/custom-templates-list/customTemplatesList.html
+++ b/app/portainer/components/custom-templates-list/customTemplatesList.html
@@ -5,7 +5,7 @@
         <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }} </div>
       </div>
       <div class="actionBar">
-        <button type="button" class="btn btn-sm btn-primary" ui-sref="portainer.templates.custom.new">
+        <button type="button" class="btn btn-sm btn-primary" ui-sref="docker.templates.custom.new">
           <i class="fa fa-plus space-right" aria-hidden="true"></i>Add Custom Template
         </button>
       </div>
@@ -32,7 +32,7 @@
         >
           <template-item-actions>
             <div ng-if="$ctrl.isEditAllowed(template)" style="display: flex;">
-              <a ui-sref="portainer.templates.custom.edit({id: template.Id})" ng-click="$event.stopPropagation();" class="btn btn-primary btn-xs" style="margin-right: 10px;">
+              <a ui-sref="docker.templates.custom.edit({id: template.Id})" ng-click="$event.stopPropagation();" class="btn btn-primary btn-xs" style="margin-right: 10px;">
                 Edit
               </a>
               <button class="btn btn-danger btn-xs" ng-click="$ctrl.onDeleteClick(template.Id); $event.stopPropagation();">Delete</button>
diff --git a/app/portainer/components/template-list/template-list-controller.js b/app/portainer/components/template-list/template-list-controller.js
index 58213d940..1b95ab2df 100644
--- a/app/portainer/components/template-list/template-list-controller.js
+++ b/app/portainer/components/template-list/template-list-controller.js
@@ -60,7 +60,7 @@ function TemplateListController($async, $state, DatatableService, Notifications,
       if (template.Type === 3) {
         type = 2;
       }
-      $state.go('portainer.templates.custom.new', { fileContent, type });
+      $state.go('docker.templates.custom.new', { fileContent, type });
     } catch (err) {
       Notifications.error('Failure', err, 'Failed to duplicate template');
     }
diff --git a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html
index 99e33f5da..fa06c6535 100644
--- a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html
+++ b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html
@@ -1,6 +1,6 @@
 <rd-header>
   <rd-header-title title-text="Create Custom template"></rd-header-title>
-  <rd-header-content> <a ui-sref="portainer.templates.custom">Custom Templates</a> &gt; Create Custom template </rd-header-content>
+  <rd-header-content> <a ui-sref="docker.templates.custom">Custom Templates</a> &gt; Create Custom template </rd-header-content>
 </rd-header>
 
 <div class="row" ng-if="!$ctrl.state.loading">
diff --git a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js
index ca1b10bb9..bfa4e9893 100644
--- a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js
+++ b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js
@@ -71,7 +71,7 @@ class CreateCustomTemplateViewController {
       await this.ResourceControlService.applyResourceControl(userId, accessControlData, ResourceControl);
 
       this.Notifications.success('Custom template successfully created');
-      this.$state.go('portainer.templates.custom');
+      this.$state.go('docker.templates.custom');
     } catch (err) {
       this.Notifications.error('Deployment error', err, 'Unable to create custom template');
     } finally {
diff --git a/app/portainer/views/custom-templates/custom-templates-view/customTemplatesView.html b/app/portainer/views/custom-templates/custom-templates-view/customTemplatesView.html
index 2ceda91c4..71120c002 100644
--- a/app/portainer/views/custom-templates/custom-templates-view/customTemplatesView.html
+++ b/app/portainer/views/custom-templates/custom-templates-view/customTemplatesView.html
@@ -1,6 +1,6 @@
 <rd-header id="view-top">
   <rd-header-title title-text="Custom Templates">
-    <a data-toggle="tooltip" title="Refresh" ui-sref="portainer.templates.custom" ui-sref-opts="{reload: true}">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="docker.templates.custom" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
   </rd-header-title>
diff --git a/app/portainer/views/custom-templates/custom-templates-view/customTemplatesViewController.js b/app/portainer/views/custom-templates/custom-templates-view/customTemplatesViewController.js
index a4e889fc2..ff456add3 100644
--- a/app/portainer/views/custom-templates/custom-templates-view/customTemplatesViewController.js
+++ b/app/portainer/views/custom-templates/custom-templates-view/customTemplatesViewController.js
@@ -140,7 +140,7 @@ class CustomTemplatesViewController {
       const { ResourceControl: resourceControl } = await createAction(stackName, file, [], endpointId);
       await this.ResourceControlService.applyResourceControl(userId, accessControlData, resourceControl);
       this.Notifications.success('Stack successfully deployed');
-      this.$state.go('portainer.stacks');
+      this.$state.go('docker.stacks');
     } catch (err) {
       this.Notifications.error('Deployment error', err, 'Failed to deploy stack');
     } finally {
diff --git a/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html b/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html
index f81badde6..4ffcbd4fa 100644
--- a/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html
+++ b/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html
@@ -1,10 +1,10 @@
 <rd-header>
   <rd-header-title title-text="Edit Custom Template">
-    <a data-toggle="tooltip" title="Refresh" ui-sref="portainer.templates.custom.edit({id:$ctrl.formValues.Id})" ui-sref-opts="{reload: true}">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="docker.templates.custom.edit({id:$ctrl.formValues.Id})" ui-sref-opts="{reload: true}">
       <i class="fa fa-sync" aria-hidden="true"></i>
     </a>
   </rd-header-title>
-  <rd-header-content> <a ui-sref="portainer.templates.custom">Custom templates</a> &gt; {{ $ctrl.formValues.Title }} </rd-header-content>
+  <rd-header-content> <a ui-sref="docker.templates.custom">Custom templates</a> &gt; {{ $ctrl.formValues.Title }} </rd-header-content>
 </rd-header>
 
 <div class="row" ng-if="$ctrl.formValues">
diff --git a/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateViewController.js b/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateViewController.js
index fd2353782..f06874b40 100644
--- a/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateViewController.js
+++ b/app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateViewController.js
@@ -73,7 +73,7 @@ class EditCustomTemplateViewController {
       await this.ResourceControlService.applyResourceControl(userId, this.formValues.AccessControlData, this.formValues.ResourceControl);
 
       this.Notifications.success('Custom template successfully updated');
-      this.$state.go('portainer.templates.custom');
+      this.$state.go('docker.templates.custom');
     } catch (err) {
       this.Notifications.error('Failure', err, 'Unable to update custom template');
     } finally {
diff --git a/app/portainer/views/stacks/create/createstack.html b/app/portainer/views/stacks/create/createstack.html
index 9f8c5a098..09ebb8b05 100644
--- a/app/portainer/views/stacks/create/createstack.html
+++ b/app/portainer/views/stacks/create/createstack.html
@@ -209,7 +209,7 @@
                   <option value="" label="Select a Custom template" disabled selected="selected"> </option>
                 </select>
                 <span ng-if="!templates.length">
-                  No custom template are available. Head over the <a ui-sref="portainer.templates.custom.new">custom template view</a> to create one.
+                  No custom template are available. Head over the <a ui-sref="docker.templates.custom.new">custom template view</a> to create one.
                 </span>
               </div>
             </div>
diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html
index a00a408ba..7bc2c041c 100644
--- a/app/portainer/views/stacks/edit/stack.html
+++ b/app/portainer/views/stacks/edit/stack.html
@@ -42,7 +42,7 @@
                   <a
                     ng-if="!state.externalStack && stackFileContent"
                     class="btn btn-primary btn-xs"
-                    ui-sref="portainer.templates.custom.new({fileContent: stackFileContent, type: stack.Type})"
+                    ui-sref="docker.templates.custom.new({fileContent: stackFileContent, type: stack.Type})"
                   >
                     Create template from stack
                   </a>