diff --git a/.flowconfig b/.flowconfig
index 87598b62..945dfd07 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -3,7 +3,7 @@
 .*/*[.]android.js
 
 ; Ignore "BUCK" generated dirs
-.*/node_modules/react-native/\.buckd/
+<PROJECT_ROOT>/\.buckd/
 
 ; Ignore unexpected extra "@providesModule"
 .*/node_modules/.*/node_modules/fbjs/.*
@@ -16,22 +16,8 @@
 ; Ignore polyfills
 .*/Libraries/polyfills/.*
 
-# React Native problems
-.*/node_modules/metro-bundler/src/DeltaBundler/DeltaCalculator.js.flow
-.*/node_modules/metro-bundler/src/DeltaBundler/DeltaPatcher.js.flow
-.*/node_modules/metro-bundler/src/node-haste/AssetResolutionCache.js.flow
-.*/node_modules/metro-bundler/src/node-haste/DependencyGraph.js.flow
-#.*/node_modules/react-native/Libraries/Animated/src/nodes/AnimatedStyle.js
-#.*/node_modules/react-native/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
-#.*/node_modules/react-native/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
-#.*/node_modules/react-native/Libraries/Experimental/SwipeableRow/SwipeableListView.js
-#.*/node_modules/react-native/Libraries/Image/ImageBackground.js
-#.*/node_modules/react-native/Libraries/Lists/FlatList.js
-#.*/node_modules/react-native/Libraries/Lists/MetroListView.js
-#.*/node_modules/react-native/Libraries/Lists/SectionList.js
-#.*/node_modules/react-native/Libraries/Lists/ViewabilityHelper.js
-#.*/node_modules/react-native/Libraries/Lists/VirtualizedList.js
-#.*/node_modules/react-native/Libraries/Lists/VirtualizedSectionList.js
+; Ignore metro
+.*/node_modules/metro/.*
 
 # Ignore dist folder
 .*/dist/.*
@@ -44,12 +30,13 @@
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
 node_modules/react-native/flow/
+node_modules/react-native/flow-github/
 
 [options]
-module.system=haste
-
 emoji=true
 
+module.system=haste
+
 munge_underscores=true
 
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
@@ -63,10 +50,9 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
-suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 suppress_comment=\\(.\\|\n\\)*\\$FlowBug.*