diff --git a/api/examples/template_example_1.json b/api/examples/template_example_1.json
index 13880be6bbcb..79bd7eec154a 100644
--- a/api/examples/template_example_1.json
+++ b/api/examples/template_example_1.json
@@ -2,21 +2,21 @@
   "id": "example1",
   "name": "my-awesome-php-app",
   "description": "Example PHP application with PostgreSQL database",
-  "buildConfig": [
+  "buildConfigs": [
     {
       "name": "mfojtik/nginx-php-app",
       "type": "docker",
       "sourceUri": "https://raw.githubusercontent.com/mfojtik/phpapp/master/Dockerfile",
-      "imageRepository": "int.registry.com:5000/mfojtik/phpapp"
+      "imageRepository": "mfojtik/nginx-php-app"
     },
     {
       "name": "postgres",
       "type": "docker",
-      "imageRepository": "registry.hub.docker.com/postgres",
-      "sourceUri": "https://raw.githubusercontent.com/docker-library/postgres/docker/9.2/Dockerfile"
+      "sourceUri": "https://raw.githubusercontent.com/docker-library/postgres/docker/9.2/Dockerfile",
+      "imageRepository": "postgres"
     }
   ],
-  "imageRepository": [
+  "imageRepositories": [
     {
       "name": "mfojtik/nginx-php-app",
       "url": "internal.registry.com:5000/mfojtik/phpapp"
@@ -43,46 +43,52 @@
       "name": "DB_NAME",
       "description": "PostgreSQL database name",
       "type": "string",
-      "generate": "db[a-zA-Z0-9]{4}"
+      "value": "mydb"
     }
   ],
-  "serviceLinks": [
+  "services": [
     {
-      "export": [
-        {
-          "name": "POSTGRES_ADMIN_USERNAME",
-          "value": "${DB_USER}"
-        },
-        {
-          "name": "POSTGRES_ADMIN_PASSWORD",
-          "value": "${DB_PASSWORD}"
-        },
-        {
-          "name": "POSTGRES_DATABASE_NAME",
-          "value": "${DB_NAME}"
-        }
-      ],
-      "from": "database",
-      "to": "frontend"
+      "id": "database",
+      "kind": "Service",
+      "apiVersion": "v1beta1",
+      "port": 5432,
+      "selector": {
+        "name": "database"
+      }
+    },
+    {
+      "id": "frontend",
+      "kind": "Service",
+      "apiVersion": "v1beta1",
+      "port": 8080,
+      "selector": {
+        "name": "frontend"
+      }
     }
   ],
-  "services": [
+  "deploymentConfigs": [
     {
-      "name": "database",
-      "description": "Standalone PostgreSQL 9.2 database service",
+      "kind": "DeploymentConfig",
+      "apiVersion": "v1beta1",
       "labels": {
-        "name": "database-service"
+        "name": "database"
       },
-      "deploymentConfig": {
-        "deployment": {
-          "podTemplate": {
-            "containers": [
-              {
-                "name": "postgresql-1",
-                "image": {
-                  "name": "postgres",
-                  "tag": "9.2"
-                },
+      "desiredState": {
+        "replicas": 2,
+        "replicaSelector": {
+          "name": "database"
+        },
+        "podTemplate": {
+          "kind": "Pod",
+          "apiVersion": "v1beta1",
+          "id": "database",
+          "desiredState": {
+            "manifest": {
+              "version": "v1beta1",
+              "id": "database",
+              "containers": [{
+                "name": "postgresql",
+                "image": "postgres",
                 "env": [
                   {
                     "name": "PGPASSWORD",
@@ -100,45 +106,66 @@
                 "ports": [
                   {
                     "containerPort": 5432,
-                    "hostPort": 5432
                   }
                 ]
               }
-            ]
+              ]
+            }
+          },
+          "labels": {
+            "name": "database"
           }
         }
       }
     },
     {
-      "name": "frontend",
-      "description": "Sample PHP 5.2 application served by NGINX",
+      "kind": "DeploymentConfig",
+      "apiVersion": "v1beta1",
       "labels": {
-        "name": "frontend-service"
+        "name": "frontend"
       },
-      "deploymentConfig": {
-        "deployment": {
-          "podTemplate": {
-            "containers": [
-              {
-                "name": "nginx-php-app",
-                "hooks": {
-                  "prestart": {
-                    "cmd": "import_database.sh"
+      "desiredState": {
+        "replicas": 2,
+        "replicaSelector": {
+          "name": "frontend"
+        },
+        "podTemplate": {
+          "kind": "Pod",
+          "apiVersion": "v1beta1",
+          "id": "frontend",
+          "desiredState": {
+            "manifest": {
+              "version": "v1beta1",
+              "id": "frontend",
+              "containers": [{
+                "name": "frontend",
+                "image": "mfojtik/nginx-php-app",
+                "env": [
+                  {
+                    "name": "PGPASSWORD",
+                    "value": "${DB_PASSWORD}"
+                  },
+                  {
+                    "name": "PGUSER",
+                    "value": "${DB_USER}"
                   },
-                  "url": "git://github.com/user/myapp-hooks.git"
-                },
-                "image": {
-                  "name": "mfojtik/nginx-php-app",
-                  "tag": "latest"
-                },
+                  {
+                    "name": "PGDATABASE",
+                    "value": "${DB_NAME}"
+                  }
+                ],
                 "ports": [
                   {
-                    "containerPort": 8080,
+                    "containerPort": 9292,
                     "hostPort": 8080
                   }
                 ]
               }
-            ]
+              ]
+            }
+          },
+          "labels": {
+            "name": "frontend"
           }
         }
       }
diff --git a/api/examples/template_example_2.json b/api/examples/template_example_2.json
deleted file mode 100644
index 6d81747cd0c0..000000000000
--- a/api/examples/template_example_2.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "id": "example2",
-  "name": "redis-cluster",
-  "description": "Example Redis cluster",
-  "buildConfig": [
-    {
-      "type": "docker",
-      "name": "kubernetes/redis-slave",
-      "imageRepository": "int.registry.com:5000/brendanburns/redis-slave",
-      "sourceUri": "https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/examples/guestbook/redis-slave/Dockerfile"
-    },
-    {
-      "name": "dockerfile/redis",
-      "type": "docker",
-      "imageRepository": "registry.hub.docker.com/dockerfile/redis",
-      "sourceUri": "https://raw.githubusercontent.com/dockerfile/redis/master/Dockerfile"
-    }
-  ],
-  "imageRepository": [
-    {
-      "name": "brendanburns/redis-slave",
-      "url": "registry.hub.docker.com/brendanburns/redis-slave"
-    },
-    {
-      "name": "dockerfile/redis",
-      "url": "registry.hub.docker.com/dockerfile/redis"
-    }
-  ],
-  "parameters": [
-    {
-      "name": "REDIS_PASSWORD",
-      "description": "Password to connect to the Redis server",
-      "type": "string",
-      "generate": "[a-zA-Z0-9]{8}"
-    }
-  ],
-  "serviceLinks": [
-    {
-      "export": [
-        {
-          "name": "REDIS_PASSWORD",
-          "value": "${REDIS_PASSWORD}"
-        }
-      ],
-      "from": "redismaster",
-      "to": "redisslaves"
-    }
-  ],
-  "services": [
-    {
-      "name": "redis-master",
-      "description": "Redis master service",
-      "labels": {
-        "name": "redis-master"
-      },
-      "deploymentConfig": {
-        "deployment": {
-          "podTemplate": {
-            "containers": [
-              {
-                "name": "redismaster",
-                "image": {
-                  "name": "dockerfile/redis",
-                  "tag": "latest"
-                },
-                "env": [
-                  {
-                    "name": "REDIS_PASSWORD",
-                    "value": "${REDIS_PASSWORD}"
-                  }
-                ],
-                "ports": [
-                  {
-                    "containerPort": 6379,
-                    "hostPort": 6379
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "redisslaves",
-      "description": "A service with set of Redis slaves",
-      "labels": {
-        "name": "redis-slaves"
-      },
-      "deploymentConfig": {
-        "deployment": {
-          "podTemplate": {
-            "containers": [
-              {
-                "name": "redis-slave",
-                "image": {
-                  "name": "brendanburns/redis-slave",
-                  "tag": "latest"
-                },
-                "ports": [
-                  {
-                    "containerPort": 6379,
-                    "hostPort": 6379
-                  }
-                ]
-              }
-            ],
-            "replicas": 3,
-            "replicaSelector": {
-              "name": "redis-slave"
-            },
-            "replicaPolicy": {
-              "atLeast": 2
-            },
-            "labels": {
-              "name": "redis-slave"
-            }
-          }
-        }
-      }
-    }
-  ]
-}
diff --git a/api/examples/template_example_3.json b/api/examples/template_example_3.json
deleted file mode 100644
index a38ee5bf902b..000000000000
--- a/api/examples/template_example_3.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "description": "Example of PHP application project linked to a Redis cluster project",
-  "id": "example3",
-  "kind": "Project",
-  "name": "php-app-with-redis",
-  "projectLinks": [
-    {
-      "from": {
-        "project": "example2",
-        "services": [
-          {
-            "name": "redis-master",
-            "export": [{
-              "name": "REDIS_PASSWORD",
-              "value": "${REDIS_PASSWORD}"
-            }
-            ]
-          }
-        ]
-      },
-      "to": {
-        "project": "example1"
-      }
-    }
-  ]
-}