diff --git a/README.md b/README.md
index 39bbbd5..f04e558 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 <!-- This file was automatically generated by the `build-harness`. Make all changes to `README.yaml` and run `make readme` to rebuild this file. -->
 
-[![Cloud Posse](https://cloudposse.com/logo-300x69.png)](https://cloudposse.com)
+[![Cloud Posse](https://cloudposse.com/logo-300x69.svg)](https://cloudposse.com)
 
-# bastion [![Build Status](https://travis-ci.org/cloudposse/bastion.svg?branch=master)](https://travis-ci.org/cloudposse/bastion-cloudtrail) [![Latest Release](https://img.shields.io/github/release/cloudposse/bastion.svg)](https://travis-ci.org/cloudposse/bastion-cloudtrail/releases) [![Slack Community](https://slack.cloudposse.com/badge.svg)](https://slack.cloudposse.com)
+# bastion [![Build Status](https://travis-ci.org/cloudposse/bastion.svg?branch=master)](https://travis-ci.org/cloudposse/bastion) [![Latest Release](https://img.shields.io/github/release/cloudposse/bastion.svg)](https://github.com/cloudposse/bastion/releases/latest) [![Slack Community](https://slack.cloudposse.com/badge.svg)](https://slack.cloudposse.com)
 
 
 This is a secure/locked-down bastion implemented as a Docker Container. It uses Alpine Linux as the base image and ships with support for Google Authenticator & DUO MFA support.
@@ -39,6 +39,7 @@ It's 100% Open Source and licensed under the [APACHE2](LICENSE).
 
 
 
+
 ## Usage
 
 ### Running
@@ -180,6 +181,7 @@ The first time you connect, you'll be asked to setup your MFA device. Subsequent
 
 
 
+
 ## Help
 
 **Got a question?**
@@ -227,11 +229,13 @@ In general, PRs are welcome. We follow the typical "fork-and-pull" Git workflow.
 
 **NOTE:** Be sure to merge the latest changes from "upstream" before making a pull request!
 
+
 ## Copyright
 
 Copyright © 2017-2018 [Cloud Posse, LLC](https://cloudposse.com)
 
 
+
 ## License 
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) 
@@ -264,7 +268,7 @@ All other trademarks referenced herein are the property of their respective owne
 
 This project is maintained and funded by [Cloud Posse, LLC][website]. Like it? Please let us know at <hello@cloudposse.com>
 
-[![Cloud Posse](https://cloudposse.com/logo-300x69.png)](https://cloudposse.com)
+[![Cloud Posse](https://cloudposse.com/logo-300x69.svg)](https://cloudposse.com)
 
 We're a [DevOps Professional Services][hire] company based in Los Angeles, CA. We love [Open Source Software](https://github.com/cloudposse/)!
 
@@ -285,7 +289,7 @@ Check out [our other projects][github], [apply for a job][jobs], or [hire us][hi
 
 ### Contributors
 
-|  [![Erik Osterman][osterman_avatar]](osterman_homepage)<br/>[Erik Osterman][osterman_homepage] | [![Marji Cermak][marji_avatar]](marji_homepage)<br/>[Marji Cermak][marji_homepage] |
+|  [![Erik Osterman][osterman_avatar]][osterman_homepage]<br/>[Erik Osterman][osterman_homepage] | [![Marji Cermak][marji_avatar]][marji_homepage]<br/>[Marji Cermak][marji_homepage] |
 |---|---|
 
   [osterman_homepage]: https://github.com/osterman
diff --git a/README.yaml b/README.yaml
index 7791a8d..58cbfd2 100644
--- a/README.yaml
+++ b/README.yaml
@@ -20,10 +20,10 @@ github_repo: cloudposse/bastion
 badges:
   - name: "Build Status"
     image: "https://travis-ci.org/cloudposse/bastion.svg?branch=master"
-    url: "https://travis-ci.org/cloudposse/bastion-cloudtrail"
+    url: "https://travis-ci.org/cloudposse/bastion"
   - name: "Latest Release"
     image: "https://img.shields.io/github/release/cloudposse/bastion.svg"
-    url: "https://travis-ci.org/cloudposse/bastion-cloudtrail/releases"
+    url: "https://github.com/cloudposse/bastion/releases/latest"
   - name: "Slack Community"
     image: "https://slack.cloudposse.com/badge.svg"
     url: "https://slack.cloudposse.com"