diff --git a/data/templates/dhcp-client/ipv6.j2 b/data/templates/dhcp-client/ipv6.j2
index 00df7a0e99..07faeb91c0 100644
--- a/data/templates/dhcp-client/ipv6.j2
+++ b/data/templates/dhcp-client/ipv6.j2
@@ -6,8 +6,12 @@ interface {{ ifname }} {
     send client-id {{ dhcpv6_options.duid }};
 {% endif %}
 {% if address is vyos_defined and 'dhcpv6' in address %}
+{%     if dhcpv6_options.no_request_dns is not vyos_defined %}
     request domain-name-servers;
+{%     endif %}
+{%     if dhcpv6_options.no_request_domain_name is not vyos_defined %}
     request domain-name;
+{%     endif %}
 {%     if dhcpv6_options.parameters_only is vyos_defined %}
     information-only;
 {%     endif %}
diff --git a/interface-definitions/include/interface/dhcpv6-options.xml.i b/interface-definitions/include/interface/dhcpv6-options.xml.i
index 68d1b172f4..99316d4ed8 100644
--- a/interface-definitions/include/interface/dhcpv6-options.xml.i
+++ b/interface-definitions/include/interface/dhcpv6-options.xml.i
@@ -11,6 +11,18 @@
         <valueless/>
       </properties>
     </leafNode>
+    <leafNode name="no-request-domain-name">
+      <properties>
+        <help>Do not request domain name</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="no-request-dns">
+      <properties>
+        <help>Do not request DNS servers</help>
+        <valueless/>
+      </properties>
+    </leafNode>
     <tagNode name="pd">
       <properties>
         <help>DHCPv6 prefix delegation interface statement</help>
diff --git a/interface-definitions/interfaces_pppoe.xml.in b/interface-definitions/interfaces_pppoe.xml.in
index 66a774e212..790cee6329 100644
--- a/interface-definitions/interfaces_pppoe.xml.in
+++ b/interface-definitions/interfaces_pppoe.xml.in
@@ -16,6 +16,21 @@
           </valueHelp>
         </properties>
         <children>
+          <leafNode name="address">
+            <properties>
+              <help>IP address</help>
+              <completionHelp>
+                <list>dhcpv6</list>
+              </completionHelp>
+              <valueHelp>
+                <format>dhcpv6</format>
+                <description>Dynamic Host Configuration Protocol for IPv6</description>
+              </valueHelp>
+              <constraint>
+                <regex>(dhcpv6)</regex>
+              </constraint>
+            </properties>
+          </leafNode>
           #include <include/pppoe-access-concentrator.xml.i>
           #include <include/interface/authentication.xml.i>
           #include <include/interface/dial-on-demand.xml.i>