diff --git a/conf/countries/worldwide.yaml b/conf/countries/worldwide.yaml
index b9db339..ac0a305 100644
--- a/conf/countries/worldwide.yaml
+++ b/conf/countries/worldwide.yaml
@@ -263,7 +263,14 @@ AE:
 
 # Afghanistan
 AF:
-    address_template: *generic21
+    address_template: |
+        {{{attention}}}
+        {{{house}}}
+        {{{road}}} {{{house_number}}} 
+        {{#first}} {{{suburb}}} || {{{city_district}}} || {{{neighbourhood}}} {{/first}}
+        {{#first}} {{{city}}} || {{{town}}} || {{{village}}} || {{{hamlet}}} || {{{state}}} {{/first}} 
+        {{{postcode}}}
+        {{{country}}}
 
 # Antigua and Barbuda
 AG:
diff --git a/testcases/countries/af.yaml b/testcases/countries/af.yaml
index 8fec3b7..2b369e7 100644
--- a/testcases/countries/af.yaml
+++ b/testcases/countries/af.yaml
@@ -8,10 +8,12 @@ components:
         country_code: af
         road: Kandahar-Herat Highway
         state: Kandahar
+        postcode: 3803
 expected:  |
     Kandahar Institute of Health Sciences
     Kandahar-Herat Highway
     Kandahar
+    3803
     Afghanistan