diff --git a/templates/wordpress/1/docker-compose.yml b/templates/wordpress/1/docker-compose.yml
new file mode 100644
index 0000000..9021b8d
--- /dev/null
+++ b/templates/wordpress/1/docker-compose.yml
@@ -0,0 +1,32 @@
+version: '2'
+services:
+  mariadb:
+      image: 'bitnami/mariadb:10.1'
+      volumes:
+        - 'mariadb_data:/bitnami'
+      environment:
+        - MARIADB_ROOT_PASSWORD=${mariadb_root_password}
+        - MARIADB_USER=${mariadb_user}
+        - MARIADB_PASSWORD=${mariadb_user_password}
+        - MARIADB_DATABASE=${mariadb_database_name}
+  wordpress:
+      image: 'bitnami/wordpress:4'
+      volumes:
+        - 'wordpress_data:/bitnami'
+      depends_on:
+        - mariadb
+      environment:
+        - WORDPRESS_DATABASE_NAME=${mariadb_database_name}
+        - WORDPRESS_DATABASE_USER=${mariadb_user} 
+        - WORDPRESS_DATABASE_PASSWORD=${mariadb_user_password}       
+        - WORDPRESS_USERNAME=${wordpress_username}
+        - WORDPRESS_PASSWORD=${wordpress_password}
+  wordpress-lb:
+    image: rancher/lb-service-haproxy:v0.7.5
+    ports:
+      - ${public_port}:${public_port}
+volumes:
+  mariadb_data:
+    driver: ${volume_driver}
+  wordpress_data:
+    driver: ${volume_driver}
\ No newline at end of file
diff --git a/templates/wordpress/1/rancher-compose.yml b/templates/wordpress/1/rancher-compose.yml
new file mode 100644
index 0000000..a23a105
--- /dev/null
+++ b/templates/wordpress/1/rancher-compose.yml
@@ -0,0 +1,86 @@
+version: '2'
+catalog:
+  name: "Wordpress"
+  version: "v0.2-bitnami"
+  description: "Blog tool, publishing platform and CMS based on bitnami images"
+  uuid: Wordpress-1
+  minimum_rancher_version: v0.51.0
+  questions:    
+    - variable: public_port
+      description: "public port to access the wordpress site"
+      label: "Public Port"
+      required: true
+      default: "80"
+      type: "int"
+    - variable: mariadb_root_password
+      description: "MariaDB root password, set on first run"
+      label: "MariaDB Root Password"
+      required: true
+      default: "mariadb_my_root"
+      type: "string"
+    - variable: mariadb_user
+      description: "MariaDB database user, created on first run"
+      label: "MariaDB Database User"
+      required: true
+      default: "wordpress_user"
+      type: "string"
+    - variable: mariadb_user_password
+      description: "MariaDB database user password, set on first run"
+      label: "MariaDB Database User Password"
+      required: true
+      default: "wordpress_password"
+      type: "string"
+    - variable: mariadb_database_name
+      description: "Wordpress database name"
+      label: "Wordpress database name"
+      required: true
+      default: "bitnami_wordpress"
+      type: "string"  
+    - variable: wordpress_username
+      description: "WordPress application username"
+      label: "WordPress application username"
+      required: true
+      default: "admin"
+      type: "string"  
+    - variable: wordpress_password
+      description: "WordPress application password"
+      label: "WordPress application password"
+      required: true
+      default: "bitnami"
+      type: "string"       
+    - variable: volume_driver
+      description: "Volume driver to use with this service"
+      label: "Volume driver"
+      required: true
+      default: "local"
+      type: enum
+      options:
+        - local
+        - rancher-nfs
+        - rancher-efs
+        - rancher-ebs
+services:
+  wordpress-lb:
+    scale: 1
+    lb_config:
+      certs: []
+      port_rules:
+      - protocol: http
+        service: wordpress
+        source_port: ${public_port}
+        target_port: 80
+    health_check:
+      response_timeout: 2000
+      healthy_threshold: 2
+      port: 42
+      unhealthy_threshold: 3
+  wordpress:
+    scale: 1
+    retain_ip: true
+    health_check:
+      port: 80
+      interval: 5000
+      unhealthy_threshold: 3
+      request_line: 'GET / HTTP/1.0'
+      healthy_threshold: 2
+      response_timeout: 5000
\ No newline at end of file
diff --git a/templates/wordpress/README.md b/templates/wordpress/README.md
new file mode 100644
index 0000000..4de1c01
--- /dev/null
+++ b/templates/wordpress/README.md
@@ -0,0 +1,12 @@
+## What is inside WordPress Stack?
+* MariaDB Database
+* WordPress (php/apache)
+* Rancher Load Balancer (haproxy)
+
+## Info
+* To persist website and database data, two volumes are created: mariadb_data, wordpress_data.
+* You can choose from one of existing rancher volume types depending on your own environment.
+
+## Compatibility Notes
+
+* Version v0.2-bitnami has some known [issue](https://github.com/bitnami/bitnami-docker-testlink/issues/17#issuecomment-261783035) with Docker overlay and overlay2 storage driver. Please try to switch to aufs or devicemapper.
diff --git a/templates/wordpress/config.yml b/templates/wordpress/config.yml
index 5f43d8b..eb08385 100644
--- a/templates/wordpress/config.yml
+++ b/templates/wordpress/config.yml
@@ -1,5 +1,5 @@
 name: Wordpress
 description: |
   Blog tool, publishing platform and CMS
-version: v0.1-educaas1
+version: v0.2-bitnami
 category: Blogging